diff --git a/Content.Server/Preferences/ServerPreferencesManager.cs b/Content.Server/Preferences/ServerPreferencesManager.cs index e9428a99e0..f7b6f70786 100644 --- a/Content.Server/Preferences/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/ServerPreferencesManager.cs @@ -66,6 +66,12 @@ namespace Content.Server.Preferences var curPrefs = prefsData.Prefs!; + if (!curPrefs.Characters.ContainsKey(index)) + { + // Non-existent slot. + return; + } + prefsData.Prefs = new PlayerPreferences(curPrefs.Characters, index); if (ShouldStorePrefs(message.MsgChannel.AuthType))