diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 13f70bd0587..39557323252 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -24,7 +24,12 @@
  *
  * Parent call
  */
-/mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
+/mob/Destroy()
+	if(client)
+		stack_trace("Mob with client has been deleted.")
+	else if(ckey)
+		stack_trace("Mob without client but with associated ckey has been deleted.")
+
 	remove_from_mob_list()
 	remove_from_dead_mob_list()
 	remove_from_alive_mob_list()
diff --git a/code/modules/unit_tests/metabolizing.dm b/code/modules/unit_tests/metabolizing.dm
index 47ce63bb218..da4f06840d6 100644
--- a/code/modules/unit_tests/metabolizing.dm
+++ b/code/modules/unit_tests/metabolizing.dm
@@ -51,15 +51,15 @@
 	var/mob/living/carbon/human/syringe_user = allocate(/mob/living/carbon/human/consistent)
 	var/mob/living/carbon/human/pill_syringe_user = allocate(/mob/living/carbon/human/consistent)
 
-	var/datum/mind/pill_mind = new /datum/mind("Mothcocks")
+	var/datum/mind/pill_mind = new /datum/mind(null)
 	pill_mind.active = TRUE
 	pill_mind.transfer_to(pill_user)
 
-	var/datum/mind/syringe_mind = new /datum/mind("Mothcocks")
+	var/datum/mind/syringe_mind = new /datum/mind(null)
 	syringe_mind.active = TRUE
 	syringe_mind.transfer_to(syringe_user)
 
-	var/datum/mind/pill_syringe_mind = new /datum/mind("Mothcocks")
+	var/datum/mind/pill_syringe_mind = new /datum/mind(null)
 	pill_syringe_mind.active = TRUE
 	pill_syringe_mind.transfer_to(pill_syringe_user)