@@ -249,8 +249,7 @@ public ErrorCheckerService(JavaEditor debugEditor) {
 
   private Thread errorCheckerThread;
   private BlockingQueue<Boolean> requestQueue = new ArrayBlockingQueue<>(1);
-  private ScheduledExecutorService scheduler =
-      Executors.newSingleThreadScheduledExecutor();
+  private ScheduledExecutorService scheduler;
   volatile ScheduledFuture<?> scheduledUiUpdate = null;
   volatile long nextUiUpdate = 0;
 
@@ -346,6 +345,7 @@ public void run() {
 
 
   public void start() {
+    scheduler = Executors.newSingleThreadScheduledExecutor();
     errorCheckerThread = new Thread(mainLoop);
     errorCheckerThread.start();
   }
@@ -354,6 +354,9 @@ public void stop() {
     cancel();
     running = false;
     errorCheckerThread.interrupt();
+    if (scheduler != null) {
+      scheduler.shutdownNow();
+    }
   }