diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index d5258646..e824e072 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2325,7 +2325,8 @@ static void Command_Map_f(void)
 		; // The player wants us to trek on anyway.  Do so.
 	// G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer
 	// Alternatively, bail if the map header is completely missing anyway.
-	else
+	else if (!mapheaderinfo[newmapnum-1]
+	 || !(mapheaderinfo[newmapnum-1]->typeoflevel & G_TOLFlag(newgametype)))
 	{
 		char gametypestring[32] = "Single Player";