1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 6a4236b4932..0709d4f6a5a 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -777,6 +777,12 @@ void ObjectMgr::LoadCreatureTemplates()
                 const_cast<CreatureInfo*>(cInfo)->scale = 1.0f;
         }
 
+        if(cInfo->expansion > (MAX_CREATURE_BASE_HP - 1))
+        {
+            sLog.outErrorDb("Table `creature_template` have creature (Entry: %u) with expansion %u ignore and set to NULL.", cInfo->expansion);
+            const_cast<CreatureInfo*>(cInfo)->expansion = 0;
+        }
+
         const_cast<CreatureInfo*>(cInfo)->dmg_multiplier *= Creature::_GetDamageMod(cInfo->rank);
     }
 }