diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm
index c56f0b7ec51..1b18202455b 100644
--- a/code/datums/cache/crew.dm
+++ b/code/datums/cache/crew.dm
@@ -20,10 +20,8 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new())
 
 	for(var/dingy in GLOB.human_list)
 		var/mob/living/carbon/human/H = dingy
-		if(!istype(H.w_uniform, /obj/item/clothing/under))
-			continue
 		var/obj/item/clothing/under/C = H.w_uniform
-		if(C.sensor_mode == SUIT_SENSOR_OFF || !C.has_sensor)
+		if(!C || C.sensor_mode == SUIT_SENSOR_OFF || !C.has_sensor)
 			continue
 		var/turf/pos = get_turf(C)
 		if(!T || pos.z != T.z)