diff --git a/Source/g_game.c b/Source/g_game.c
index 626423d1..aaf659f6 100644
--- a/Source/g_game.c
+++ b/Source/g_game.c
@@ -2386,7 +2386,7 @@ void G_WorldDone(void)
 
       return;
     }
-    else if (gamemapinfo->endpic[0] && (strcmp(gamemapinfo->endpic, "-") != 0))
+    else if (gamemapinfo->endpic[0] && gamemapinfo->endpic[0] != '-' && !secretexit)
     {
       // game ends without a status screen.
       gameaction = ga_victory;
diff --git a/Source/u_mapinfo.c b/Source/u_mapinfo.c
index 6bf125c6..4ccf5b2d 100644
--- a/Source/u_mapinfo.c
+++ b/Source/u_mapinfo.c
@@ -542,7 +542,7 @@ static int ParseStandardProperty(u_scanner_t* s, mapentry_t *mape)
     status = ParseLumpName(s, mape->nextsecret);
     if (!G_ValidateMapName(mape->nextsecret, NULL, NULL))
     {
-      U_Error(s, "Invalid map name %s", mape->nextmap);
+      U_Error(s, "Invalid map name %s", mape->nextsecret);
       status = 0;
     }
   }