diff --git a/code/datums/components/dullahan.dm b/code/datums/components/dullahan.dm
index 9401d3d3d0..09c65600f1 100644
--- a/code/datums/components/dullahan.dm
+++ b/code/datums/components/dullahan.dm
@@ -12,8 +12,9 @@
 
 	dullahan_head = new(get_turf(H))
 
-	dullahan_head.name = "[H.name]'s head"
-	dullahan_head.desc = "the decapitated head of [H.name]"
+	if(length(H.name))
+		dullahan_head.name = "[H.name]'s head"
+		dullahan_head.desc = "the decapitated head of [H.name]"
 	dullahan_head.owner = H
 	RegisterSignal(H, COMSIG_LIVING_REGENERATE_LIMBS, .proc/unlist_head)
 
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 409916da30..3d08998a82 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -3359,7 +3359,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		wheels.buckle_mob(character)
 	var/datum/component/dullahan/dullahan = character.GetComponent(/datum/component/dullahan)
 	// if you ready up, quirks are assigned first, very stupid
-	if(dullahan && dullahan.dullahan_head)
+	if(dullahan && dullahan.dullahan_head && length(dullahan_head.name))
 		dullahan.dullahan_head.name = "[character.name]'s head"
 		dullahan.dullahan_head.desc = "the decapitated head of [character.name]"