diff --git a/src/game/Formulas.h b/src/game/Formulas.h
index 041c0621c7..2ec175f95b 100644
--- a/src/game/Formulas.h
+++ b/src/game/Formulas.h
@@ -117,7 +117,7 @@ namespace Trinity
                 (((Creature*)u)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) ))
                 return 0;
 
-            uint32 xp_gain= BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(pl->GetMapId(),pl->GetZoneId()));
+            uint32 xp_gain= BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(u->GetMapId(),u->GetZoneId()));
             if( xp_gain == 0 )
                 return 0;
 
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 66a06135ec..24128fc85c 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -13668,6 +13668,7 @@ void Unit::SetToNotify()
 
 void Unit::Kill(Unit *pVictim, bool durabilityLoss)
 {
+    assert(pVictim->IsInWorld() && pVictim->FindMap());
     // Prevent killing unit twice (and giving reward from kill twice)
     if (!pVictim->GetHealth())
         return;