diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm
index d7ee78ff8fe..fb99da896f3 100644
--- a/code/_helpers/game.dm
+++ b/code/_helpers/game.dm
@@ -281,6 +281,9 @@
 
 	//A list of every mob with a client
 	for(var/mob in player_list)
+		if(isnull(mob)) //VOREStation Add - Fix for a weird bug with nulls in this list
+			player_list -= mob //VOREStation Add
+			continue //VOREStation Add
 		if(get_turf(mob) in hearturfs)
 			mobs |= mob
 			continue