diff --git a/code/ZAS/FEA_system.dm b/code/ZAS/FEA_system.dm
index 87c35c3dad0..c8ceb5c0786 100644
--- a/code/ZAS/FEA_system.dm
+++ b/code/ZAS/FEA_system.dm
@@ -180,6 +180,7 @@ datum
 						var/output = T.update_air_properties()
 						if(. && T && !output)
 							. = 0 //If a runtime occured, make sure we can sense it.
+							log_admin("ZASALERT: Either a null turf in list/tiles_to_update, or unable run turf/simualted/update_air_properties()")
 					tiles_to_update = list()
 
 				if(connections_to_check.len)
@@ -199,8 +200,10 @@ datum
 							Z.last_update = current_cycle
 						if(. && Z && !output)
 							. = 0
+							log_admin("ZASALERT: Either a null zone in list/zones, or unable run zone/process()")
 
 				for(var/obj/fire/F in active_hotspots)
 					var/output = F.process()
 					if(. && F && !output)
-						. = 0
\ No newline at end of file
+						. = 0
+						log_admin("ZASALERT: Either a null fire in list/active_hotspots, or unable run obj/fire/process()")
\ No newline at end of file
diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm
index d628bdfc195..1e566039ee4 100644
--- a/code/game/master_controller.dm
+++ b/code/game/master_controller.dm
@@ -177,10 +177,12 @@ 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 > 10)
+				if(air_master.failed_ticks > 20)
 					world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER.  Killing air simulation!</font></b>"
 					kill_air = 1
 					air_master.failed_ticks = 0
+			else if (air_master.failed_ticks > 10)
+				air_master.failed_ticks = 0
 		air_master_ready = 1
 
 		src.set_debug_state("Tension Master")