From fbbecbdba505ddab86736963cfb44ac6bdd66e77 Mon Sep 17 00:00:00 2001
From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Date: Tue, 19 Jul 2022 22:12:35 -0400
Subject: [PATCH] Fixes the issues with the database that have been forcing us
 to have #10823 test-merged for half a year (#15061)

* Don't try to make a query on a client that doesn't exist

* If this is actually why it's been shitting the bed, I swear to god
---
 code/controllers/configuration/entries/dbconfig.dm     | 2 +-
 modular_skyrat/modules/title_screen/code/new_player.dm | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm
index 2597a123a68..842e4f88058 100644
--- a/code/controllers/configuration/entries/dbconfig.dm
+++ b/code/controllers/configuration/entries/dbconfig.dm
@@ -49,5 +49,5 @@
 	min_val = 1
 
 /datum/config_entry/number/max_concurrent_queries
-	config_entry_value = 25
+	default = 25
 	min_val = 1
diff --git a/modular_skyrat/modules/title_screen/code/new_player.dm b/modular_skyrat/modules/title_screen/code/new_player.dm
index baf67ffe248..21ae13c8a28 100644
--- a/modular_skyrat/modules/title_screen/code/new_player.dm
+++ b/modular_skyrat/modules/title_screen/code/new_player.dm
@@ -228,6 +228,9 @@
  * Shows the player a list of current polls, if any.
  */
 /mob/dead/new_player/proc/playerpolls()
+	if(!usr || !client)
+		return
+
 	var/output
 	if (!SSdbcore.Connect())
 		return