Moar fixes

code/_globalvars/lists/mapping_globals.dm

@@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(teleporter_landmarks)
 
 GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST))
 GLOBAL_LIST_EMPTY(nightmare_landmarks)
+GLOBAL_LIST_EMPTY(nightmare_landmark_tags_removed)
 
 GLOBAL_LIST_EMPTY(ship_areas)
 

code/game/objects/effects/landmarks/landmarks.dm

@@ -90,9 +90,11 @@
 		return
 	GLOB.nightmare_landmarks[insert_tag] = get_turf(src)
 /obj/effect/landmark/nightmare/Destroy()
-	if(insert_tag && autoremove \
-	   && GLOB.nightmare_landmarks[insert_tag] == get_turf(src))
-		GLOB.nightmare_landmarks.Remove(insert_tag)
+	if(insert_tag)
+		var/turf/turf = get_turf(src)
+		if(autoremove && GLOB.nightmare_landmarks[insert_tag] == turf)
+			GLOB.nightmare_landmarks.Remove(insert_tag)
+		GLOB.nightmare_landmark_tags_removed += insert_tag
 	return ..()
 
 /obj/effect/landmark/ert_spawns/distress

code/modules/nightmare/nmtasks/mapload.dm

@@ -48,7 +48,11 @@
 	UNTIL(!Master.map_loading)
 	target_turf = GLOB.nightmare_landmarks[landmark]
 	if(!target_turf?.z)
-		CRASH("Nightmare Mapload: Could not find landmark: [landmark]")
+		if(landmark in GLOB.nightmare_landmark_tags_removed)
+			log_debug("Nightmare Mapload: Could not find landmark: [landmark] because it was deleted")
+			return
+		else
+			CRASH("Nightmare Mapload: Could not find landmark: [landmark]")
 	var/result = parsed.load(target_turf.x, target_turf.y, target_turf.z, crop_map = TRUE, no_changeturf = FALSE, place_on_top = FALSE, delete = replace)
 	if(!result || !parsed.bounds)
 		CRASH("Nightmare Mapload: Map insertion failed unexpectedly for file: [filepath]")