diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index f7b335d95..0b11e815d 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1552,8 +1552,10 @@ static int rtp_rom_loop(const struct rtp_ops *ops,
 		}
 		if (retval == ERROR_OK)
 			retval = dap_run(ap->dap);
-		if (retval != ERROR_OK)
+		if (retval != ERROR_OK) {
 			LOG_DEBUG("Failed read ROM table entry");
+			return retval;
+		}
 
 		if (width == 64) {
 			romentry = (((uint64_t)romentry_high) << 32) | romentry_low;