diff --git a/src/services/ai/states/DeathState.java b/src/services/ai/states/DeathState.java
index f2e593cb..d7da3a9f 100644
--- a/src/services/ai/states/DeathState.java
+++ b/src/services/ai/states/DeathState.java
@@ -33,8 +33,11 @@ public class DeathState extends AIState {
 		NGECore.getInstance().aiService.awardExperience(actor);
 		NGECore.getInstance().aiService.awardGcw(actor);
 		actor.getCreature().setAttachment("radial_filename", "npc/corpse");
-		//NGECore.getInstance().scriptService.callScript("scripts/radial/npc/corpse", "", "createRadial", NGECore.getInstance(), actor.getCreature().getKiller(), actor.getCreature(), new Vector<RadialOptions>());
-		NGECore.getInstance().lootService.DropLoot((CreatureObject)(actor.getCreature().getKiller()),(TangibleObject)(actor.getCreature()));			
+		//NGECore.getInstance().scriptService.callScript("scripts/radial/npc/corpse", "", "createRadial", NGECore.getInstance(), actor.getCreature().getKiller(), actor.getCreature(), new Vector<RadialOptions>());		
+		CreatureObject killer = (CreatureObject)actor.getCreature().getKiller();
+		if (killer==null)
+			killer = actor.getHighestDamageDealer();
+		NGECore.getInstance().lootService.DropLoot(killer,(TangibleObject)(actor.getCreature()));			
 		actor.scheduleDespawn();
 		return 0;
 	}