diff --git a/Source/Framework/Constants/Language.cs b/Source/Framework/Constants/Language.cs
index be11c0902..026ad85e0 100644
--- a/Source/Framework/Constants/Language.cs
+++ b/Source/Framework/Constants/Language.cs
@@ -375,7 +375,7 @@ namespace Framework.Constants
         CommandModifyArena = 306,
         CommandFactionNotfound = 307,
         CommandFactionUnknown = 308,
-        CommandFactionInvparam = 309,
+        CommandInvalidParam = 309,
         CommandFactionDelta = 310,
         FactionList = 311,
         FactionVisible = 312,
diff --git a/Source/Game/Chat/Commands/ModifyCommands.cs b/Source/Game/Chat/Commands/ModifyCommands.cs
index 0379bce46..4a06cdab3 100644
--- a/Source/Game/Chat/Commands/ModifyCommands.cs
+++ b/Source/Game/Chat/Commands/ModifyCommands.cs
@@ -425,7 +425,7 @@ namespace Game.Chat
 
                     if (i == ReputationMgr.ReputationRankThresholds.Length - 1)
                     {
-                        handler.SendSysMessage(CypherStrings.CommandFactionInvparam, rankTxt);
+                        handler.SendSysMessage(CypherStrings.CommandInvalidParam, rankTxt);
                         return false;
                     }
 
diff --git a/Source/Game/Chat/Commands/NPCCommands.cs b/Source/Game/Chat/Commands/NPCCommands.cs
index 9193f18d2..c9391b8c4 100644
--- a/Source/Game/Chat/Commands/NPCCommands.cs
+++ b/Source/Game/Chat/Commands/NPCCommands.cs
@@ -1219,6 +1219,12 @@ namespace Game.Chat
                     return false;
                 }
 
+                if (!CliDB.CreatureDisplayInfoStorage.ContainsKey(displayId))
+                {
+                    handler.SendSysMessage(CypherStrings.CommandInvalidParam, args);
+                    return false;
+                }
+
                 creature.SetDisplayId(displayId);
                 creature.SetNativeDisplayId(displayId);