From 6a09df577fef45ecd78b8f7a0967119021ea0066 Mon Sep 17 00:00:00 2001
From: Cameron Lennox <killer65311@gmail.com>
Date: Mon, 28 Apr 2025 16:31:23 -0400
Subject: [PATCH] Fixes migration issue (#17628)

---
 code/modules/client/preference_setup/loadout/loadout.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm
index 46b87bedf8..80a797a49c 100644
--- a/code/modules/client/preference_setup/loadout/loadout.dm
+++ b/code/modules/client/preference_setup/loadout/loadout.dm
@@ -90,7 +90,7 @@ var/list/gear_datums = list()
 		if(pref.client)
 			if(G.ckeywhitelist && !(pref.client_ckey in G.ckeywhitelist))
 				continue
-			if(G.character_name && !(pref.client.prefs.real_name in G.character_name))
+			if(G.character_name && pref.client.prefs && !(pref.client.prefs.real_name in G.character_name))
 				continue
 		. += gear_name
 
@@ -171,7 +171,7 @@ var/list/gear_datums = list()
 		if(preference_mob && preference_mob.client)
 			if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist))
 				continue
-			if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))
+			if(G.character_name && preference_mob.client.prefs && !(preference_mob.client.prefs.real_name in G.character_name))
 				continue
 		var/ticked = (G.display_name in pref.gear)
 		. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='byond://?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"