diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index ba7fdedbdb0..37f39d332a5 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -535,7 +535,7 @@
 				screenmob.client.screen += H.r_store
 
 			//SKYRAT EDIT ADDITION BEGIN - ERP_SLOT_SYSTEM
-			if(H.client.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+			if(H.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
 				if(H.vagina)
 					H.vagina.screen_loc = ui_vagina
 					screenmob.client.screen += H.vagina
diff --git a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
index eb8c49d07df..661537c3cf2 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
@@ -88,9 +88,11 @@
 			if (part in mutant_bodyparts)
 				mutant_bodyparts -= part
 		else
-			mutant_bodyparts[part] = list()
 			var/datum/preference/choiced/name = GLOB.preference_entries_by_key["feature_[part]"]
 			var/datum/preference/tri_color/color = GLOB.preference_entries_by_key["[part]_color"]
+			if (isnull(name) || isnull(color))
+				return
+			mutant_bodyparts[part] = list()
 			mutant_bodyparts[part][MUTANT_INDEX_NAME] = read_preference(name.type)
 			mutant_bodyparts[part][MUTANT_INDEX_COLOR_LIST] = read_preference(color.type)
 	if (istype(preference, /datum/preference/choiced))