diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index bf05e7576..f97c50680 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -209,7 +209,7 @@ static const RecordFactoryEntry recordFactories [] = {
     { "NiNode",                     &construct <NiNode                      >, RC_NiNode                        },
     { "AvoidNode",                  &construct <NiNode                      >, RC_NiNode                        },
     { "NiBSParticleNode",           &construct <NiNode                      >, RC_NiNode                        },
-    { "NiBSAnimationNode",          &construct <NiNode                      >, RC_NiNode                        },
+    { "NiBSAnimationNode",          &construct <NiNode                      >, RC_NiBSAnimationNode             },
     { "NiBillboardNode",            &construct <NiNode                      >, RC_NiNode                        },
     { "NiTriShape",                 &construct <NiTriShape                  >, RC_NiTriShape                    },
     { "NiRotatingParticles",        &construct <NiRotatingParticles         >, RC_NiRotatingParticles           },
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 3a3cd9b84..361af3f64 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -59,6 +59,7 @@ enum RecordType
   RC_NiMaterialColorController,
   RC_NiBSPArrayController,
   RC_NiParticleSystemController,
+  RC_NiBSAnimationNode,
   RC_NiLight,
   RC_NiTextureEffect,
   RC_NiVertWeightsExtraData,
diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index 215462bac..377fa9418 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -464,6 +464,10 @@ void loadResource(Ogre::Resource *resource)
         return;
     }
 
+    /* Animations without textkeys don't get Ogre::Animation objects. */
+    if(!animroot)
+        return;
+
     std::vector<std::string> targets;
     // TODO: If ctrls.size() == 0, check for a .kf file sharing the name of the .nif file
     if(ctrls.size() == 0) // No animations? Then we're done.
@@ -486,13 +490,6 @@ void loadResource(Ogre::Resource *resource)
         return;
     }
 
-    if(!animroot)
-    {
-        warn(Ogre::StringConverter::toString(ctrls.size())+" animated node(s) in "+
-             skel->getName()+", but no text keys.");
-        return;
-    }
-
     Ogre::UserObjectBindings &bindings = animroot->getUserObjectBindings();
     bindings.setUserAny(sTextKeyExtraDataID, Ogre::Any(true));