diff --git a/code/modules/client/preference_setup/vore/08_nif.dm b/code/modules/client/preference_setup/vore/08_nif.dm
index 630f41aef4..b124fe1138 100644
--- a/code/modules/client/preference_setup/vore/08_nif.dm
+++ b/code/modules/client/preference_setup/vore/08_nif.dm
@@ -62,4 +62,9 @@
 	*/
 
 /datum/category_item/player_setup_item/vore/nif/content(var/mob/user)
+
+	if(!pref.client.etching)
+		log_debug("[user] etching data to populate")
+		return
+
 	. += "<b>NIF:</b> [ispath(text2path("[pref.client.etching.nif_type]")) ? "Present" : "None"]"	//RS EDIT
diff --git a/code/modules/mob/living/Character Persist/character_persistance_core.dm b/code/modules/mob/living/Character Persist/character_persistance_core.dm
index d43994bfe7..a811659149 100644
--- a/code/modules/mob/living/Character Persist/character_persistance_core.dm	
+++ b/code/modules/mob/living/Character Persist/character_persistance_core.dm	
@@ -212,7 +212,7 @@
 	if(ourmob)
 		log_debug("<span class = 'rose'>Mob etching load complete for [ourmob.real_name].</span>")
 	if(ourclient)
-		log_debug("<span class = 'rose'>Client etching load complete for [ourclient.prefs.real_name].</span>")
+		log_debug("<span class = 'rose'>Client etching load complete for [P.real_name].</span>")
 
 /datum/etching/proc/save(delet = FALSE)
 	if(ourmob)