diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index fbe5a1fb30..3d2772b20c 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -86,7 +86,11 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
 		return
 
 	if(href_list["move"])
+<<<<<<< HEAD
 		if(z != ZLEVEL_STATION && shuttleId == "colony_drop")
+=======
+		if(!(z in GLOB.station_z_levels) && shuttleId == "colony_drop")
+>>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing)
 			to_chat(usr, "<span class='warning'>You can't move the base again!</span>")
 			return
 		var/shuttle_error = SSshuttle.moveShuttle(shuttleId, href_list["move"], 1)
diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
index c12c83aaed..76c36b1bf4 100644
--- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
@@ -44,7 +44,11 @@
 	//var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels)
 	for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines)
 		// Delaminating, not within coverage, not on a tile.
+<<<<<<< HEAD
 		if(!(S.z == ZLEVEL_STATION || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/))
+=======
+		if(!(S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z || !istype(S.loc, /turf/))
+>>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing)
 			continue
 		supermatters.Add(S)