diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index aab949f3ca5..d1ca07be2e6 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -157,7 +157,7 @@
 	.["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho
 	.["gamestate"] = SSticker.current_state
 
-	.["map_name"] = SSmapping.config.map_name
+	.["map_name"] = SSmapping.config?.map_name || "Loading..."
 
 	if(key_valid)
 		.["active_players"] = get_active_player_count()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 035db484bb3..0557ddd6beb 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -514,7 +514,7 @@
 	if(statpanel("Status"))
 		if (client)
 			stat(null, "Ping: [round(client.lastping, 1)]ms (Average: [round(client.avgping, 1)]ms)")
-		stat(null, "Map: [SSmapping.config.map_name]")
+		stat(null, "Map: [SSmapping.config?.map_name || "Loading..."]")
 		var/datum/map_config/cached = SSmapping.next_map_config
 		if(cached)
 			stat(null, "Next Map: [cached.map_name]")