diff --git a/code/_helpers/names.dm b/code/_helpers/names.dm
index cea166b9156..20f7b2b31da 100644
--- a/code/_helpers/names.dm
+++ b/code/_helpers/names.dm
@@ -16,7 +16,7 @@ var/church_name = null
 	return name
 
 /proc/command_name()
-	if (using_map.boss_name)
+	if(istype(using_map))
 		return using_map.boss_name
 
 /proc/change_command_name(var/name)