diff --git a/src/game/WorldHandlers/Map.cpp b/src/game/WorldHandlers/Map.cpp
index b0e3910b..ec0f65b0 100644
--- a/src/game/WorldHandlers/Map.cpp
+++ b/src/game/WorldHandlers/Map.cpp
@@ -1234,7 +1234,9 @@ void Map::RemoveFromActive(WorldObject* obj)
         ActiveNonPlayers::iterator itr = m_activeNonPlayers.find(obj);
         if (itr == m_activeNonPlayersIter)
             { ++m_activeNonPlayersIter; }
-        m_activeNonPlayers.erase(itr);
+
+        if (itr != m_activeNonPlayers.end())
+            { m_activeNonPlayers.erase(itr); }
     }
     else
         { m_activeNonPlayers.erase(obj); }