Index: Build/Tactical/Tactical_Save.cc
===================================================================
--- Build/Tactical/Tactical_Save.cc	(revision 7059)
+++ Build/Tactical/Tactical_Save.cc	(working copy)
@@ -720,9 +720,19 @@
 			def.sGridNo = FindNearestAvailableGridNoForCorpse(&def, 5);
 			if (def.sGridNo == NOWHERE)
 				def.sGridNo = FindNearestAvailableGridNoForCorpse(&def, 15);
-			/* ATE: Here we still could have a bad location, but send in NOWHERE to
-			 * corpse function anyway, 'cause it will iwth not drop it or use a map
-			 * edgepoint */
+				/* ATE: Here we still could have a bad location, but send in NOWHERE to
+				 * corpse function anyway, 'cause it will iwth not drop it or use a map
+				 * edgepoint */
+
+				/* 2010-04-29:
+				 * The corpse func does nothing from NOWHERE.
+				 * No need to force our way to it as the
+				 * comment above suggests.
+				 * NOWHERE is (WORLD_MAX + 1), and would
+				 * fail the next test but I leave this line
+				 * for clarity.
+				 */
+				if (def.sGridNo == NOWHERE) { continue; }
 		}
 		else if (def.usFlags & ROTTING_CORPSE_USE_NORTH_ENTRY_POINT)
 		{
@@ -741,6 +751,9 @@
 			def.sGridNo = gMapInformation.sWestGridNo;
 		}
 
+		/* 2010-04-29: Don't add a corpse on an invalid gridno */
+		if (def.sGridNo >= WORLD_MAX || def.sGridNo < 0)  { continue; }
+
 		/* ATE: Don't place corpses if not loading a savegame, in town, indoors and
 		 * the corpse is too old */
 		if (maybe_dont_add &&