diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 97ba4652f..e94624ade 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -140,7 +140,8 @@ namespace MWWorld
         virtual void clearDynamic()
         {
             // remove the dynamic part of mShared
-            mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
+            if (mShared.size() > mStatic.size())
+                mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
             mDynamic.clear();
         }
 
@@ -217,7 +218,8 @@ namespace MWWorld
 
         void setUp() {
             // remove the dynamic part of mShared
-            mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
+            if (mShared.size() > mStatic.size())
+                mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
         }
 
         iterator begin() const {
@@ -305,7 +307,8 @@ namespace MWWorld
             mDynamic.erase(it);
 
             // have to reinit the whole shared part
-            mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
+            if (mShared.size() > mStatic.size())
+                mShared.erase(mShared.begin() + mStatic.size(), mShared.end());
             for (it = mDynamic.begin(); it != mDynamic.end(); ++it) {
                 mShared.push_back(&it->second);
             }
@@ -338,20 +341,6 @@ namespace MWWorld
         }
     };
 
-    template <>
-    inline void Store<ESM::NPC>::clearDynamic()
-    {
-        std::map<std::string, ESM::NPC>::iterator iter = mDynamic.begin();
-
-        while (iter!=mDynamic.end())
-            if (iter->first=="player")
-                ++iter;
-            else
-                mDynamic.erase (iter++);
-
-        mShared.clear();
-    }
-
     template <>
     inline void Store<ESM::Dialogue>::load(ESM::ESMReader &esm, const std::string &id) {
         std::string idLower = Misc::StringUtils::lowerCase(id);