diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index cda4e179fcc..55afd32a737 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -40,9 +40,14 @@
 	client.set_right_click_menu_mode(shift_to_open_context_menu)
 
 	if(!hud_used)
-		create_mob_hud()
+		create_mob_hud() // creating a hud will add it to the client's screen, which can process a disconnect
+		if(!client)
+			return FALSE
+
 	if(hud_used)
-		hud_used.show_hud(hud_used.hud_version)
+		hud_used.show_hud(hud_used.hud_version) // see above, this can process a disconnect
+		if(!client)
+			return FALSE
 		hud_used.update_ui_style(ui_style2icon(client.prefs?.read_preference(/datum/preference/choiced/ui_style)))
 
 	next_move = 1