diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 15a4aed4adb..e68ee9ee1f2 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -66,7 +66,7 @@ SUBSYSTEM_DEF(vote)
 	// Remove AFK or clientless non-voters.
 	for(var/non_voter_ckey in non_voters)
 		var/client/non_voter_client = non_voters[non_voter_ckey]
-		if(!non_voter_client || non_voter_client.is_afk())
+		if(!istype(non_voter_client) || non_voter_client.is_afk())
 			non_voters -= non_voter_ckey
 
 	// Now get the result of the vote.
diff --git a/code/datums/mocking/client.dm b/code/datums/mocking/client.dm
index 72a0eddd5da..418f5cfb8db 100644
--- a/code/datums/mocking/client.dm
+++ b/code/datums/mocking/client.dm
@@ -35,7 +35,9 @@
 	src.key = "[key]_[mock_client_uid]"
 	ckey = ckey(key)
 
+#ifdef UNIT_TESTS // otherwise this shit can leak into production servers which is drather bad
 	GLOB.directory[ckey] = src
+#endif
 
 /datum/client_interface/Destroy(force, ...)
 	GLOB.directory -= ckey