diff --git a/src/p_setup.c b/src/p_setup.c
index 9a270d2f3..9b5b7e5c2 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -585,15 +585,11 @@ Ploadflat (levelflat_t *levelflat, const char *flatname)
 			if (strnicmp(levelflat[i].name, flatname, 8) == 0)
 				return i;
 		}
+
+		if (numlevelflats >= MAXLEVELFLATS)
+			I_Error("Too many flats in level\n");
 	}
 
-#ifndef ZDEBUG
-	CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
-#endif
-
-	if (numlevelflats >= MAXLEVELFLATS)
-		I_Error("Too many flats in level\n");
-
 	if (levelflat)
 		levelflat += numlevelflats;
 	else
@@ -656,6 +652,10 @@ flatfound:
 		levelflat->u.flat.baselumpnum = LUMPERROR;
 	}
 
+#ifndef ZDEBUG
+	CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
+#endif
+
 	return ( numlevelflats++ );
 }