diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 4c1ab93c65..076761f93f 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -281,9 +281,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(config.mutant_races && species_id && (species_id in GLOB.roundstart_species))
 		var/newtype = GLOB.roundstart_species[species_id]
 		pref_species = new newtype()
-	else
+	else if (config.roundstart_races.len)
 		var/rando_race = pick(config.roundstart_races)
-		pref_species = new rando_race()
+		if (rando_race)
+			pref_species = new rando_race()
 
 	if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
 		S["features["mcolor"]"]	<< "#FFF"