1 files changed, 2 insertions, 1 deletions
diff --git a/npc/commands/python.txt b/npc/commands/python.txt
index 5273731c3..81753b368 100644
--- a/npc/commands/python.txt
+++ b/npc/commands/python.txt
@@ -9,7 +9,7 @@
 
 OnCall:
     specialeffect(34, AREA, playerattached());
-    .@zone$=getmapinfo(MAPINFO_ZONE, .@mapa$);
+    .@zone$=getmapinfo(MAPINFO_ZONE, getmap());
     if (.@zone$ == "MMO")
         end;
     sc_start SC_CASH_DEATHPENALTY, 1000, 1;
@@ -17,6 +17,7 @@ OnCall:
     end;
 
 OnKill:
+    if (ispcdead()) end;
     percentheal -100, -100;
     //dispbottom l("Oh look, it is Cupid!");
     end;