diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index 1ae31b9c2e6..984928e7fb5 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -343,7 +343,7 @@ GLOBAL_LIST_INIT(huds, list(
 	var/list/exceptions = hud_exceptions
 	for(var/mob/requesting_mob as anything in requesting_mobs)
 		if(!requesting_mob.client)
-			return
+			continue
 		if(!exceptions[requesting_mob] || !(hud_atom in exceptions[requesting_mob]))
 			requesting_mob.client.images |= images_to_add
 
@@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(huds, list(
 
 	for(var/mob/client_mob as anything in client_mobs)
 		if(!client_mob.client)
-			return
+			continue
 		client_mob.client.images -= images_to_remove
 
 /datum/atom_hud/proc/unregister_atom(datum/source, force)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 44ffe6bb72b..1c776758a57 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1181,7 +1181,9 @@
 **/
 /mob/proc/has_nightvision()
 	// Somewhat conservative, basically is your lighting plane bright enough that you the user can see stuff
-	var/light_offset = (lighting_color_cutoffs[1] + lighting_color_cutoffs[2] + lighting_color_cutoffs[3]) / 3 + lighting_cutoff
+	var/light_offset = lighting_cutoff
+	if(length(lighting_color_cutoffs) == 3)
+		light_offset += (lighting_color_cutoffs[1] + lighting_color_cutoffs[2] + lighting_color_cutoffs[3]) / 3
 	return light_offset >= LIGHTING_NIGHTVISION_THRESHOLD
 
 /// This mob is abile to read books