diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index c70b7016a4..5cfbeb9414 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -393,10 +393,8 @@ SUBSYSTEM_DEF(job)
 				continue
 			S = sloc
 			break
-		if(GLOB.jobspawn_overrides[rank])
-			var/list/special_spawns = GLOB.jobspawn_overrides[rank]
-			if(special_spawns.len)
-				S = pick(special_spawns)
+		if(length(GLOB.jobspawn_overrides[rank]))
+			S = pick(GLOB.jobspawn_overrides[rank])
 		if(S)
 			SendToAtom(H, S, buckle = FALSE)
 		if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper
@@ -540,11 +538,9 @@ SUBSYSTEM_DEF(job)
 	M.forceMove(get_turf(A))
 
 /datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE)
-	if(M.mind && M.mind.assigned_role) //We're doing something special today.
-		var/list/special_spawns = GLOB.jobspawn_overrides[M.mind.assigned_role]
-		if(special_spawns.len) //just in case someone clears these
-			SendToAtom(M,pick(special_spawns),FALSE)
-			return
+	if(M.mind && M.mind.assigned_role && length(GLOB.jobspawn_overrides[M.mind.assigned_role])) //We're doing something special today.
+		SendToAtom(M,pick(GLOB.jobspawn_overrides[M.mind.assigned_role]),FALSE)
+		return
 
 	if(latejoin_trackers.len)
 		SendToAtom(M, pick(latejoin_trackers), buckle)