diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index b39a5ed9742..465bd187912 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -40,16 +40,16 @@
 
 /obj/machinery/computer/message_monitor/LateInitialize()
 	//Is the monitor isn't linked to a server, and there's a server available, default it to the first one in the list.
-	if(!linkedServer)
-		if(length(GLOB.message_servers))
-			linkedServer = GLOB.message_servers[1]
-			RegisterSignal(linkedServer, COMSIG_PARENT_QDELETING, .proc/unlink_server)
+	if(!linkedServer && length(GLOB.message_servers))
+		linkedServer = GLOB.message_servers[1]
+		RegisterSignal(linkedServer, COMSIG_PARENT_QDELETING, .proc/unlink_server)
 
 /obj/machinery/computer/message_monitor/proc/unlink_server()
 	linkedServer = null
 
 /obj/machinery/computer/message_monitor/Destroy()
 	customrecepient = null
+	linkedServer = null
 	return ..()
 
 /obj/machinery/computer/message_monitor/screwdriver_act(mob/user, obj/item/I)
diff --git a/code/modules/arcade/mob_hunt/mob_avatar.dm b/code/modules/arcade/mob_hunt/mob_avatar.dm
index 815e8a762fa..5411d686b51 100644
--- a/code/modules/arcade/mob_hunt/mob_avatar.dm
+++ b/code/modules/arcade/mob_hunt/mob_avatar.dm
@@ -24,6 +24,9 @@
 /obj/effect/nanomob/Destroy()
 	SSmob_hunt.trap_spawns -= src
 	SSmob_hunt.normal_spawns -= src
+	clients_encountered.Cut()
+	QDEL_NULL(mob_info)
+	qdel(avatar)
 	return ..()
 
 /obj/effect/nanomob/proc/update_self()
diff --git a/code/modules/pda/mob_hunt_game_app.dm b/code/modules/pda/mob_hunt_game_app.dm
index 18c235cbeae..50b5350651a 100644
--- a/code/modules/pda/mob_hunt_game_app.dm
+++ b/code/modules/pda/mob_hunt_game_app.dm
@@ -30,8 +30,7 @@
 
 /datum/data/pda/app/mob_hunter_game/Destroy()
 	STOP_PROCESSING(SSobj, pda)
-	if(SSmob_hunt)
-		SSmob_hunt.connected_clients -= src
+	SSmob_hunt.connected_clients -= src
 	return ..()
 
 /datum/data/pda/app/mob_hunter_game/proc/scan_nearby()
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 90c52eaea2f..ee15317f928 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -40,8 +40,9 @@
 	w -= disable_wire
 
 /obj/machinery/r_n_d/Destroy()
-	loaded_item.forceMove(get_turf(src))
-	loaded_item = null
+	if(loaded_item)
+		loaded_item.forceMove(get_turf(src))
+		loaded_item = null
 	linked_console = null
 	materials = null
 	return ..()