diff --git a/source/game/game/script_manager.cpp b/source/game/game/script_manager.cpp
index e2289452c..adc2b003c 100644
--- a/source/game/game/script_manager.cpp
+++ b/source/game/game/script_manager.cpp
@@ -1757,8 +1757,6 @@ namespace Game {
 		Unit *
 			unit = world->findUnitById(unitId);
 		if (unit != NULL) {
-			// Make sure they die
-			bool unit_dead = unit->decHp(unit->getHp() * unit->getHp());
 			unit->kill();
 			// If called from an existing die event we get a stack overflow
 			//onUnitDied(unit);
diff --git a/source/game/world/world.cpp b/source/game/world/world.cpp
index 46968c994..cc2674269 100644
--- a/source/game/world/world.cpp
+++ b/source/game/world/world.cpp
@@ -1465,6 +1465,8 @@ namespace Game {
 			} else {
 				if (throwOnError)
 					throw game_runtime_error("Invalid position command: " + commandName, true);
+				else
+					return;
 			}
 
 			if (unit->getType()->getFirstCtOfClass(cc) == NULL) {