diff --git a/mods/ex666_ecosystem/code/experience/subsystem.dm b/mods/ex666_ecosystem/code/experience/subsystem.dm
index f9fbd66c4f5d7..619d73a3c7d26 100644
--- a/mods/ex666_ecosystem/code/experience/subsystem.dm
+++ b/mods/ex666_ecosystem/code/experience/subsystem.dm
@@ -96,7 +96,7 @@ SUBSYSTEM_DEF(experience)
 
 	for (var/client/client as anything in clients_to_process)
 		// If a client logs out in the middle of this or has no mob or mind
-		if(!client || !client.mob || !client.mob.mind)
+		if(!client || !client.mob || !client.mob.mind || !select_queries[client.ckey])
 			clients_to_process.Remove(client)
 			continue
 
diff --git a/mods/lobbyscreen/code/lobby.dm b/mods/lobbyscreen/code/lobby.dm
index 1a54758663d85..c2255af7db75c 100644
--- a/mods/lobbyscreen/code/lobby.dm
+++ b/mods/lobbyscreen/code/lobby.dm
@@ -6,6 +6,9 @@
 		update_titlescreen(player.client)
 
 /datum/map/proc/update_titlescreen(client/C)
+	if (isnull(C))
+		return
+
 	var/state = Master.current_runlevel || 0
 	var/mob/new_player/player = C.mob
 	send_output(C, "[state]-[player.ready]", "lobbybrowser:setStatus")