diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm
index ec4a0cabe34..d628bdfc195 100644
--- a/code/game/master_controller.dm
+++ b/code/game/master_controller.dm
@@ -177,7 +177,7 @@ datum/controller/game_controller
 			var/success = air_master.tick() //Changed so that a runtime does not crash the ticker.
 			if(!success) //Runtimed.
 				air_master.failed_ticks++
-				if(air_master.failed_ticks > 5)
+				if(air_master.failed_ticks > 10)
 					world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER.  Killing air simulation!</font></b>"
 					kill_air = 1
 					air_master.failed_ticks = 0
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index fb385604bd3..dd9781c889f 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -164,7 +164,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	//locate an empty mouse
 	var/list/eligible_targets = new()
 	for(var/mob/living/simple_animal/mouse/M in world)
-		if(!M.ckey)
+		if(!M.ckey && !M.stat)
 			eligible_targets.Add(M)
 
 	var/mob/living/simple_animal/mouse/target_mouse
diff --git a/code/modules/mob/simple_animal/simple_animal_misc.dm b/code/modules/mob/simple_animal/simple_animal_misc.dm
index bf0bd1e1be0..3e96eda4a9d 100644
--- a/code/modules/mob/simple_animal/simple_animal_misc.dm
+++ b/code/modules/mob/simple_animal/simple_animal_misc.dm
@@ -198,6 +198,7 @@
 	icon_state = icon_dead
 	stat = DEAD
 	density = 0
+	src << "\red You have died!"
 	return
 
 /mob/living/simple_animal/ex_act(severity)