diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index ecc41489a..f66f7ca62 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -144,12 +144,12 @@ namespace MWMechanics
                     mCurrentNode = mAllowedNodes[index];
                     mAllowedNodes.erase(mAllowedNodes.begin() + index);
                 }
-
-                if(mAllowedNodes.empty())
-                    mDistance = 0;
             }
         }
 
+        if(mAllowedNodes.empty())
+            mDistance = 0;
+
         // Don't try to move if you are in a new cell (ie: positioncell command called) but still play idles.
         if(mDistance && (mCellX != actor.getCell()->mCell->mData.mX || mCellY != actor.getCell()->mCell->mData.mY))
             mDistance = 0;
@@ -200,6 +200,7 @@ namespace MWMechanics
         {
             if(!mPathFinder.isPathConstructed())
             {
+                assert(mAllowedNodes.size());
                 unsigned int randNode = (int)(rand() / ((double)RAND_MAX + 1) * mAllowedNodes.size());
                 Ogre::Vector3 destNodePos(mAllowedNodes[randNode].mX, mAllowedNodes[randNode].mY, mAllowedNodes[randNode].mZ);