diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm
index 0834f20be6c..c186643e51d 100644
--- a/code/modules/mob/mob_misc_procs.dm
+++ b/code/modules/mob/mob_misc_procs.dm
@@ -593,7 +593,7 @@
 	name = newname
 	if(mind)
 		mind.name = newname
-		if(mind?.initial_account?.account_name == oldname)
+		if(!isnull(oldname) && mind?.initial_account?.account_name == oldname)
 			mind.initial_account.account_name = newname
 	if(dna)
 		dna.real_name = real_name