diff --git a/infra/build_specified_commit.py b/infra/build_specified_commit.py
index 30f4b43ca..9b59cd088 100644
--- a/infra/build_specified_commit.py
+++ b/infra/build_specified_commit.py
@@ -127,6 +127,9 @@ def build_fuzzers_from_commit(commit, build_repo_manager, host_src_path,
     ],
                                                       check_result=True)
     oss_fuzz_commit = oss_fuzz_commit.strip()
+    if not oss_fuzz_commit:
+      logging.warning('No suitable earlier OSS-Fuzz commit found.')
+      break
 
     logging.info('Build failed. Retrying on earlier OSS-Fuzz commit %s.',
                  oss_fuzz_commit)