diff --git a/jme3-core/src/main/resources/com/jme3/asset/General.cfg b/jme3-core/src/main/resources/com/jme3/asset/General.cfg
index c56b62146..66ed68e49 100644
--- a/jme3-core/src/main/resources/com/jme3/asset/General.cfg
+++ b/jme3-core/src/main/resources/com/jme3/asset/General.cfg
@@ -22,5 +22,4 @@ LOADER com.jme3.scene.plugins.ogre.MaterialLoader : material
 LOADER com.jme3.scene.plugins.ogre.SceneLoader : scene
 LOADER com.jme3.scene.plugins.blender.BlenderModelLoader : blend
 LOADER com.jme3.shader.plugins.GLSLLoader : vert, frag, geom, tsctrl, tseval, glsl, glsllib
-LOADER com.jme3.scene.plugins.fbx.SceneLoader : fbx
-LOADER com.jme3.scene.plugins.fbx.SceneWithAnimationLoader : fba
+LOADER com.jme3.scene.plugins.fbx.FbxLoader : fbx
diff --git a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/obj/FbxObjectFactory.java b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/obj/FbxObjectFactory.java
index ec8c1fd67..111750df1 100644
--- a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/obj/FbxObjectFactory.java
+++ b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/obj/FbxObjectFactory.java
@@ -74,6 +74,12 @@ public final class FbxObjectFactory {
                        subclassName.equals("FKEffector")) {
                 // jME3 does not support IK.
                 return FbxNullAttribute.class;
+            } else if (subclassName.equals("Light")) {
+                // TODO: support lights
+                return FbxNullAttribute.class;
+            } else if (subclassName.equals("Camera")) {
+                // TODO: support cameras
+                return FbxNullAttribute.class;
             } else {
                 // NodeAttribute - Unknown
                 logger.log(Level.WARNING, "Unknown object subclass: {0}. Ignoring.", subclassName);