diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index a09a58191..14f5cc4e7 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -68,7 +68,8 @@ namespace MWRender
 
 float HeadAnimationTime::getValue() const
 {
-    // TODO: Handle eye blinking (time is in the text keys)
+    // TODO use time from text keys (Talk Start/Stop, Blink Start/Stop)
+    // TODO: Handle eye blinking
     if (MWBase::Environment::get().getSoundManager()->sayDone(mReference))
         return 0;
     else
diff --git a/components/nif/niffile.hpp b/components/nif/niffile.hpp
index 79e1cc2a5..d4b042726 100644
--- a/components/nif/niffile.hpp
+++ b/components/nif/niffile.hpp
@@ -199,6 +199,11 @@ struct KeyListT {
                 key.mContinuity = nif->getFloat();
             }
         }
+        else if (mInterpolationType == 0)
+        {
+            if (count != 0)
+                nif->file->fail("Interpolation type 0 doesn't work with keys");
+        }
         else
             nif->file->fail("Unhandled interpolation type: "+Ogre::StringConverter::toString(mInterpolationType));
     }