diff --git a/src/java/org/web3d/vrml/renderer/DefaultNodeFactory.java b/src/java/org/web3d/vrml/renderer/DefaultNodeFactory.java
index 80f19068bbc8fed06c7878e29ad74924feffef47..90f5c30fc239b7bd4693a5c29bba4869cc92da47 100644
--- a/src/java/org/web3d/vrml/renderer/DefaultNodeFactory.java
+++ b/src/java/org/web3d/vrml/renderer/DefaultNodeFactory.java
@@ -483,7 +483,11 @@ public class DefaultNodeFactory
         ComponentInfo ret_val = findComponent(name, level);
 
         if(ret_val == null)
+        {
+            System.err.println ("[Xj3D DefaultNodeFactory.addComponent] Exception, not finding component name=" + name +
+                ", level=" + level);
             throw new UnsupportedComponentException();
+        }
 
         // Reupdate the latest versions just in case another thread changed
         // them while we were not looking.
@@ -732,7 +736,9 @@ public class DefaultNodeFactory
         }
 
         VRMLNode ret_val = null;
-        String node_name = node.getVRMLNodeName();
+        String node_name = new String();
+        if (node != null)
+            node_name = node.getVRMLNodeName();
 
         ComponentInfo ci = nodeNameComponentMap.get(node_name);