diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 3ec845f3d..d1760b093 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -2453,9 +2453,17 @@ bool ChatHandler::HandleModifyMorphCommand(char* args)
     if (!*args)
         return false;
 
-    uint16 display_id = (uint16)atoi(args);
+    uint32 display_id = (uint32)atoi(args);
 
-    Unit *target = getSelectedUnit();
+    CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(display_id);
+    if (!displayEntry)
+    {
+        SendSysMessage(LANG_BAD_VALUE);
+        SetSentErrorMessage(true);
+        return false;
+    }
+
+    Unit* target = getSelectedUnit();
     if (!target)
         target = m_session->GetPlayer();
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 804fd35a2..8ca1f4538 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 "11934"
+ #define REVISION_NR "11935"
 #endif // __REVISION_NR_H__