diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 72f7ebaf2e..067e856720 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -180,6 +180,18 @@ void Animation::createObjectList(Ogre::SceneNode *node, const std::string &model
 }
 
 
+Ogre::Node *Animation::getNode(const std::string &name)
+{
+    if(mObjectList.mSkelBase)
+    {
+        Ogre::SkeletonInstance *skel = mObjectList.mSkelBase->getSkeleton();
+        if(skel->hasBone(name))
+            return skel->getBone(name);
+    }
+    return NULL;
+}
+
+
 bool Animation::hasAnimation(const std::string &anim)
 {
     for(std::vector<NifOgre::ObjectList>::const_iterator iter(mAnimationSources.begin());iter != mAnimationSources.end();iter++)
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 2fcc1e8f70..cfef28f16c 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -113,6 +113,8 @@ public:
 
     void play(const std::string &groupname, const std::string &start, const std::string &stop, bool loop);
     virtual Ogre::Vector3 runAnimation(float timepassed);
+
+    Ogre::Node *getNode(const std::string &name);
 };
 
 }
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 843bcf007b..616543a7d4 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -201,7 +201,7 @@ namespace MWRender
     void RaceSelectionPreview::updateCamera()
     {
         Ogre::Vector3 scale = mNode->getScale();
-        Ogre::Vector3 headOffset = mAnimation->getHeadNode()->_getDerivedPosition();
+        Ogre::Vector3 headOffset = mAnimation->getNode("Bip01 Head")->_getDerivedPosition();
         headOffset = mNode->convertLocalToWorldPosition(headOffset);
 
         mCamera->setPosition(headOffset + mPosition * scale);
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 253dbb0ff7..d7620a8de5 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -451,9 +451,4 @@ void NpcAnimation::addPartGroup(int group, int priority, const std::vector<ESM::
     }
 }
 
-Ogre::Node* NpcAnimation::getHeadNode()
-{
-    return mObjectList.mSkelBase->getSkeleton()->getBone("Bip01 Head");
-}
-
 }
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index b59051a8d6..224d174f43 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -78,8 +78,6 @@ public:
 
     virtual Ogre::Vector3 runAnimation(float timepassed);
 
-    Ogre::Node* getHeadNode();
-
     void forceUpdate()
     { updateParts(true); }
 };