diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 94e8726d368..559672bc40b 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -144,9 +144,10 @@ var/const/enterloopsanity = 100
 			if(objects > enterloopsanity) break
 			objects++
 			spawn(0)
-				A.HasProximity(thing, 1)
-				if ((thing && A) && (thing.flags & PROXMOVE))
-					thing.HasProximity(A, 1)
+				if(A)
+					A.HasProximity(thing, 1)
+					if ((thing && A) && (thing.flags & PROXMOVE))
+						thing.HasProximity(A, 1)
 	return
 
 /turf/proc/adjacent_fire_act(turf/simulated/floor/source, temperature, volume)
diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm
index 7c60bb75e43..0ea59bb7347 100644
--- a/code/modules/mob/living/silicon/ai/latejoin.dm
+++ b/code/modules/mob/living/silicon/ai/latejoin.dm
@@ -1,6 +1,8 @@
 var/global/list/empty_playable_ai_cores = list()
 
 /hook/roundstart/proc/spawn_empty_ai()
+	if("AI" in ticker.mode.disabled_jobs)
+		return 1	// Don't make empty AI's if you can't have them (also applies to Malf)
 	for(var/obj/effect/landmark/start/S in landmarks_list)
 		if(S.name != "AI")
 			continue