diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index 97066e7..35b9f15 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -178,11 +178,8 @@
     } else if (fap->fa_id == FLASH_AREA_IMAGE_PRIMARY(image_index) ||
                fap->fa_id == FLASH_AREA_IMAGE_SECONDARY(image_index)) {
         return BOOT_STATUS_STATE_COUNT * BOOT_STATUS_MAX_ENTRIES;
-    } else {
-        /* FIXME: make error values negative and check on caller */
-        assert(0);
-        return BOOT_EBADARGS;
     }
+    return -1;
 }
 
 uint32_t
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index fc5d09c..e01d00e 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -577,6 +577,9 @@
 
     off = boot_status_off(fap);
     max_entries = boot_status_entries(BOOT_CURR_IMG(state), fap);
+    if (max_entries < 0) {
+        return BOOT_EBADARGS;
+    }
 
     found = 0;
     found_idx = 0;