diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c
index b198387b..2bbe5c4c 100644
--- a/src/bin/jp2/opj_compress.c
+++ b/src/bin/jp2/opj_compress.c
@@ -488,7 +488,8 @@ static unsigned int get_num_images(char *imgdirpath)
         }
         if (num_images == UINT_MAX) {
             fprintf(stderr, "Too many files in folder %s\n", imgdirpath);
-            return 0;
+            num_images = 0;
+            break;
         }
         num_images++;
     }
diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
index e622dbc1..8ac2d9c7 100644
--- a/src/bin/jp2/opj_decompress.c
+++ b/src/bin/jp2/opj_decompress.c
@@ -391,7 +391,8 @@ unsigned int get_num_images(char *imgdirpath)
         }
         if (num_images == UINT_MAX) {
             fprintf(stderr, "Too many files in folder %s\n", imgdirpath);
-            return 0;
+            num_images = 0;
+            break;
         }
         num_images++;
 
diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c
index dea0d349..b297fefd 100644
--- a/src/bin/jp2/opj_dump.c
+++ b/src/bin/jp2/opj_dump.c
@@ -143,7 +143,8 @@ static unsigned int get_num_images(char *imgdirpath)
         }
         if (num_images == UINT_MAX) {
             fprintf(stderr, "Too many files in folder %s\n", imgdirpath);
-            return 0;
+            num_images = 0;
+            break;
         }
         num_images++;
     }