*Merge.

--HG--
branch : trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index ef3cb99d919..f08ef8aa40d 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -4392,6 +4392,9 @@ bool ChatHandler::HandleCreatePetCommand(const char* args)
     // Everything looks OK, create new pet
     Pet* pet = new Pet(player, HUNTER_PET);
 
+    if(!pet)
+      return false;
+    
     if(!pet->CreateBaseAtCreature(creatureTarget))
     {
         delete pet;
@@ -4410,6 +4413,7 @@ bool ChatHandler::HandleCreatePetCommand(const char* args)
     {
         sLog.outError("ERROR: InitStatsForLevel() in EffectTameCreature failed! Pet deleted.");
         PSendSysMessage("Error 2");
+        delete pet;
         return false;
     }