diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index 8dbc49ab6c..e685a884b5 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -1872,7 +1872,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv)
 				continue;
 			input = batchline;
 			bargv[bargc] = next_token(&input, " \t\r\n");
-			while ((bargv[bargc] != NULL) && (bargc < 14)) {
+			while ((bargc < 14) && (bargv[bargc] != NULL)) {
 				bargc++;
 				bargv[bargc] = next_token(&input, " \t\r\n");
 			}