diff --git a/Source/Game/Chat/Commands/PetCommands.cs b/Source/Game/Chat/Commands/PetCommands.cs
index 606ea3da4..a5fe513d1 100644
--- a/Source/Game/Chat/Commands/PetCommands.cs
+++ b/Source/Game/Chat/Commands/PetCommands.cs
@@ -39,6 +39,11 @@ namespace Game.Chat
 
             // Everything looks OK, create new pet
             Pet pet = player.CreateTamedPetFrom(creatureTarget);
+            if (pet == null)
+            {
+                handler.SendSysMessage("CreateTamedPetFrom returned null.");
+                return false;
+            }
 
             // "kill" original creature
             creatureTarget.DespawnOrUnsummon();