diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 4d7a32b04f3..d52f18fdd70 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -170,10 +170,10 @@
 				visible_message("\The [src] clicks quietly as it stops [environment.temperature > target_temperature ? "cooling" : "heating"] the room.",\
 				"You hear a click as a faint electronic humming stops.")
 
-
+		var/old_level = danger_level
 		danger_level = overall_danger_level()
 
-		if (alarm_area.master_air_alarm == src)
+		if (old_level != danger_level)
 			refresh_danger_level()
 			update_icon()
 
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 71cccfdc3ee..31fbb8c4679 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -299,6 +299,7 @@
 	if(src.patient && src.path.len == 0 && (get_dist(src,src.patient) > 1))
 		spawn(0)
 			src.path = AStar(src.loc, get_turf(src.patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 30,id=botcard)
+			if (!path) path = list()
 			if(src.path.len == 0)
 				src.oldpatient = src.patient
 				src.patient = null
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index 19a43f41cc7..fb3646653c1 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -583,7 +583,7 @@ Auto Patrol: []"},
 // given an optional turf to avoid
 /obj/machinery/bot/secbot/proc/calc_path(var/turf/avoid = null)
 	src.path = AStar(src.loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance, 0, 120, id=botcard, exclude=avoid)
-
+	if (!path) path = list()
 
 // look for a criminal in view of the bot