diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c
index 8f9eb36b..56e4b32d 100644
--- a/tools/quake3/q3map2/bsp.c
+++ b/tools/quake3/q3map2/bsp.c
@@ -766,6 +766,11 @@ int BSPMain( int argc, char **argv ){
 	char path[ 1024 ], tempSource[ 1024 ];
 	qboolean onlyents = qfalse;
 
+	if ( argc >= 2 && !strcmp( argv[ 1 ], "-bsp" ) ) {
+		Sys_Printf( "-bsp argument unnecessary\n" );
+		argv++;
+		argc--;
+	}
 
 	/* note it */
 	Sys_Printf( "--- BSP ---\n" );
@@ -1051,9 +1056,6 @@ int BSPMain( int argc, char **argv ){
 			Sys_Printf( "Max Area face surface generation enabled\n" );
 			maxAreaFaceSurface = qtrue;
 		}
-		else if ( !strcmp( argv[ i ], "-bsp" ) ) {
-			Sys_Printf( "-bsp argument unnecessary\n" );
-		}
 		else if ( !strcmp( argv[ i ], "-noob" ) ) {
 			Sys_Printf( "No oBs!\n" );
 			noob = qtrue;
diff --git a/tools/quake3/q3map2/convert_bsp.c b/tools/quake3/q3map2/convert_bsp.c
index 44950e7d..d11beb17 100644
--- a/tools/quake3/q3map2/convert_bsp.c
+++ b/tools/quake3/q3map2/convert_bsp.c
@@ -152,7 +152,7 @@ int AnalyzeBSP( int argc, char **argv ){
 
 
 	/* arg checking */
-	if ( argc < 1 ) {
+	if ( argc < 2 ) {
 		Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
 		return 0;
 	}
@@ -933,7 +933,7 @@ int ConvertBSPMain( int argc, char **argv ){
 	force_map = qfalse;
 
 	/* arg checking */
-	if ( argc < 1 ) {
+	if ( argc < 2 ) {
 		Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
 		return 0;
 	}
diff --git a/tools/quake3/q3map2/exportents.c b/tools/quake3/q3map2/exportents.c
index 00f8357f..b39409d5 100644
--- a/tools/quake3/q3map2/exportents.c
+++ b/tools/quake3/q3map2/exportents.c
@@ -90,7 +90,7 @@ void ExportEntities( void ){
 
 int ExportEntitiesMain( int argc, char **argv ){
         /* arg checking */
-        if ( argc < 1 ) {
+        if ( argc < 2 ) {
                 Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" );
                 return 0;
         }
diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c
index d9cbef84..b5fd5f01 100644
--- a/tools/quake3/q3map2/lightmaps_ydnar.c
+++ b/tools/quake3/q3map2/lightmaps_ydnar.c
@@ -154,7 +154,7 @@ void ExportLightmaps( void ){
 
 int ExportLightmapsMain( int argc, char **argv ){
 	/* arg checking */
-	if ( argc < 1 ) {
+	if ( argc < 2 ) {
 		Sys_Printf( "Usage: q3map -export [-v] <mapname>\n" );
 		return 0;
 	}
@@ -189,7 +189,7 @@ int ImportLightmapsMain( int argc, char **argv ){
 
 
 	/* arg checking */
-	if ( argc < 1 ) {
+	if ( argc < 2 ) {
 		Sys_Printf( "Usage: q3map -import [-v] <mapname>\n" );
 		return 0;
 	}