Index: lib/fuzzer/FuzzerLoop.cpp
===================================================================
--- lib/fuzzer/FuzzerLoop.cpp
+++ lib/fuzzer/FuzzerLoop.cpp
@@ -743,7 +743,7 @@
     Printf("INFO: %zd/%zd inputs touch the focus function\n",
            Corpus.NumInputsThatTouchFocusFunction(), Corpus.size());
 
-  if (Corpus.empty()) {
+  if (Corpus.empty() && Options.MaxNumberOfRuns) {
     Printf("ERROR: no interesting inputs were found. "
            "Is the code instrumented for coverage? Exiting.\n");
     exit(1);
Index: test/fuzzer/not-instrumented.test
===================================================================
--- test/fuzzer/not-instrumented.test
+++ test/fuzzer/not-instrumented.test
@@ -1,4 +1,4 @@
 RUN: %cpp_compiler %S/NotinstrumentedTest.cpp -fsanitize-coverage=0 -o %t-NotinstrumentedTest-NoCoverage
-RUN: not %run %t-NotinstrumentedTest-NoCoverage 2>&1 | FileCheck %s --check-prefix=NO_COVERAGE
+RUN: not %run %t-NotinstrumentedTest-NoCoverage -runs=1 2>&1 | FileCheck %s --check-prefix=NO_COVERAGE
 
 NO_COVERAGE: ERROR: no interesting inputs were found. Is the code instrumented for coverage? Exiting