diff --git a/Source/Game/Entities/Unit/Unit.Pets.cs b/Source/Game/Entities/Unit/Unit.Pets.cs
index 55d354113..3d2ce2369 100644
--- a/Source/Game/Entities/Unit/Unit.Pets.cs
+++ b/Source/Game/Entities/Unit/Unit.Pets.cs
@@ -107,6 +107,12 @@ namespace Game.Entities
                     return;
                 }
 
+                if (!IsInWorld)
+                {
+                    Log.outFatal(LogFilter.Unit, $"SetMinion: Minion being added to owner not in world. Minion: {minion.GetGUID()}, Owner: {GetDebugInfo()}");
+                    return;
+                }
+
                 minion.SetOwnerGUID(GetGUID());
 
                 if (!m_Controlled.Contains(minion))