content

code/modules/mob/living/brain/brain.dm

@@ -34,10 +34,11 @@
 		if(stat!=DEAD)	//If not dead.
 			death(1)	//Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
 		if(mind)	//You aren't allowed to return to brains that don't exist
-			mind.current = null
+			mind.set_current(null)
 			mind.active = FALSE		//No one's using it anymore.
 		ghostize()		//Ghostize checks for key so nothing else is necessary.
 	container = null
+	QDEL_NULL(stored_dna)
 	return ..()
 
 /mob/living/brain/update_mobility()

code/modules/mob/living/brain/brain_item.dm

@@ -282,6 +282,8 @@
 	if(brainmob)
 		QDEL_NULL(brainmob)
 	QDEL_LIST(traumas)
+	if(owner?.mind)
+		owner.mind.set_current(null)
 	return ..()
 
 //other types of brains