diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
index c9d7e25549a..d74d5ac1fc1 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
@@ -582,12 +582,13 @@ public class TestSearcherManager extends ThreadedIndexingAndSearchingTestCase {
               }
             }
             docs.close();
-            stop.set(true);
             if (VERBOSE) {
               System.out.println("TEST: index count=" + writerRef.get().maxDoc());
             }
           } catch (IOException ioe) {
             throw new RuntimeException(ioe);
+          } finally {
+            stop.set(true);
           }
         }
       };