1 files changed, 8 insertions, 2 deletions
diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp
index b8a0b8aa7ac..f1cebdf0746 100644
--- a/src/server/game/Handlers/NPCHandler.cpp
+++ b/src/server/game/Handlers/NPCHandler.cpp
@@ -372,9 +372,15 @@ void WorldSession::SendPetStableResult(StableResult result)
 
 void WorldSession::HandleSetPetSlot(WorldPackets::NPC::SetPetSlot& setPetSlot)
 {
-    if (!CheckStableMaster(setPetSlot.StableMaster) || setPetSlot.DestSlot >= PET_SAVE_LAST_STABLE_SLOT)
+    if (!CheckStableMaster(setPetSlot.StableMaster))
     {
-        SendPetStableResult(StableResult::InternalError);
+        SendPetStableResult(StableResult::NotStableMaster);
+        return;
+    }
+
+    if (setPetSlot.DestSlot >= PET_SAVE_LAST_STABLE_SLOT)
+    {
+        SendPetStableResult(StableResult::InvalidSlot);
         return;
     }