diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 956ad4778a0..80661056a13 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -203,6 +203,8 @@
 					for(var/mob/dead/observer/G in player_list)
 						if(G.mind == mind)
 							foundghost = 1
+							if (G.can_reenter_corpse == 0)
+								foundghost = 0
 							break
 				if(!foundghost)
 					msg += " and [t_his] soul has departed"
@@ -211,6 +213,9 @@
 			msg += "<span class='deadsay'>It appears that [t_his] brain is missing...</span>\n"
 
 	var/temp = getBruteLoss() //no need to calculate each of these twice
+
+	msg += "<span class='warning'>"
+
 	if(temp)
 		if(temp < 30)
 			msg += "[t_He] [t_has] minor bruising.\n"
@@ -246,9 +251,9 @@
 	else if(getBrainLoss() >= 60)
 		msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
 
-	if(!key && brain_op_stage != 4)
+	if(!key && brain_op_stage != 4 && stat != DEAD)
 		msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely</span>\n"
-	else if(!client && brain_op_stage != 4)
+	else if(!client && brain_op_stage != 4 && stat != DEAD)
 		msg += "[t_He] [t_has] a vacant, braindead stare...\n"
 
 	if(digitalcamo)