diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index e0f60bd2c..993f795d6 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -141,6 +141,12 @@ void WaypointManager::Load()
             }
         }
 
+        if (be.spell && ! sSpellStore.LookupEntry(be.spell))
+        {
+            sLog.outErrorDb("Table creature_movement references unknown spellid %u. Skipping id %u.", be.spell, id);
+            continue;
+        }
+
         if (be.emote)
         {
             if (!sEmotesStore.LookupEntry(be.emote))
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 8bf574e41..2fa6e8b0d 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8809"
+ #define REVISION_NR "8810"
 #endif // __REVISION_NR_H__