diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 9ad12133cf3..2b7278a3657 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -35,6 +35,15 @@
 	RefreshParts()
 	update_recharge_turf()
 
+/obj/machinery/mech_bay_recharge_port/Destroy()
+	if(recharge_console)
+		recharge_console.recharge_port = null
+		recharge_console.update_icon()
+	recharge_console = null
+	recharging_mecha = null
+	recharging_turf = null
+	return ..()
+
 /obj/machinery/mech_bay_recharge_port/proc/update_recharge_turf()
 	recharging_turf = get_step(loc, dir)
 
@@ -51,9 +60,24 @@
 	RefreshParts()
 	update_recharge_turf()
 
+/obj/machinery/mech_bay_recharge_port/proc/update_recharging_mecha()
+	if(recharging_mecha)
+		if(recharging_mecha.loc == recharging_turf)
+			return  // no need to update anything
+		// it wandered away
+		UnregisterSignal(recharging_mecha, COMSIG_PARENT_QDELETING)
+		recharging_mecha = null
+	recharging_mecha = locate(/obj/mecha) in recharging_turf
+	if(recharging_mecha)
+		// so that we don't hold references to it after it's gone, and not causing GC issues
+		RegisterSignal(recharging_mecha, COMSIG_PARENT_QDELETING, .proc/on_mecha_qdel)
+
+/obj/machinery/mech_bay_recharge_port/proc/on_mecha_qdel()
+	recharging_mecha = null
+
 /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated/process()
 	if(!recharging_mecha)
-		recharging_mecha = locate(/obj/mecha) in recharging_turf
+		update_recharging_mecha()
 	if(recharging_mecha && recharging_mecha.cell)
 		if(recharging_mecha.cell.charge < recharging_mecha.cell.maxcharge)
 			var/delta = min(max_charge, recharging_mecha.cell.maxcharge - recharging_mecha.cell.charge)
@@ -85,17 +109,11 @@
 	if(default_deconstruction_crowbar(user, I))
 		return TRUE
 
-/obj/machinery/mech_bay_recharge_port/Destroy()
-	if(recharge_console)
-		recharge_console.recharge_port = null
-		recharge_console.update_icon()
-	return ..()
-
 /obj/machinery/mech_bay_recharge_port/process()
 	if(stat & NOPOWER || !recharge_console)
 		return
 	if(!recharging_mecha)
-		recharging_mecha = locate(/obj/mecha) in recharging_turf
+		update_recharging_mecha()
 		if(recharging_mecha)
 			recharge_console.update_icon()
 	if(recharging_mecha && recharging_mecha.cell)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 48731b84b83..da80e14aafe 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -57,7 +57,7 @@
 	var/list/operation_req_access = list()//required access level for mecha operation
 	var/list/internals_req_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)//required access level to open cell compartment
 
-	var/wreckage
+	var/obj/structure/mecha_wreckage/wreckage = null  // type that the mecha becomes when destroyed
 
 	var/list/equipment = new
 	var/obj/item/mecha_parts/mecha_equipment/selected
@@ -609,25 +609,25 @@
 		trackers -= A
 
 /obj/mecha/Destroy()
+	STOP_PROCESSING(SSobj, src)
 	if(occupant)
 		occupant.SetSleeping(destruction_sleep_duration)
 	go_out()
-	var/mob/living/silicon/ai/AI
 	for(var/mob/M in src) //Let's just be ultra sure
 		if(isAI(M))
-			occupant = null
-			AI = M //AIs are loaded into the mech computer itself. When the mech dies, so does the AI. They can be recovered with an AI card from the wreck.
+			var/mob/living/silicon/ai/AI = M //AIs are loaded into the mech computer itself. When the mech dies, so does the AI. They can be recovered with an AI card from the wreck.
+			AI.gib() //No wreck, no AI to recover
 		else
 			M.forceMove(loc)
+	occupant = null
+	selected = null
 	for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
 		E.detach(loc)
 		qdel(E)
 	equipment.Cut()
 	QDEL_NULL(cell)
 	QDEL_NULL(internal_tank)
-	if(AI)
-		AI.gib() //No wreck, no AI to recover
-	STOP_PROCESSING(SSobj, src)
+	QDEL_NULL(radio)
 	GLOB.poi_list.Remove(src)
 	if(loc)
 		loc.assume_air(cabin_air)
@@ -635,9 +635,11 @@
 	else
 		qdel(cabin_air)
 	cabin_air = null
+	connected_port = null
 	QDEL_NULL(spark_system)
 	QDEL_NULL(smoke_system)
 	QDEL_LIST(trackers)
+	remove_from_all_data_huds()
 	GLOB.mechas_list -= src //global mech list
 	return ..()