diff --git a/scheduler.py b/scheduler.py
index 1cb8bba7dfe9f5444cd65627a1671cf3e9c13dd7_c2NoZWR1bGVyLnB5..9fa3e4084371c9b8f3651cf7cc87960172babfb6_c2NoZWR1bGVyLnB5 100644
--- a/scheduler.py
+++ b/scheduler.py
@@ -95,6 +95,9 @@
                     run(task_arguments)
                 elif task_type == "EXIT":
                     return
+                else:
+                    msg = "Unknown task %s"
+                    print(msg % task_type)
             finally:
                 LOGGER.info("Ending %r %r", task_type, task_arguments)
                 print("\n" * 2)
diff --git a/tests/test-scheduler.t b/tests/test-scheduler.t
index 1cb8bba7dfe9f5444cd65627a1671cf3e9c13dd7_dGVzdHMvdGVzdC1zY2hlZHVsZXIudA==..9fa3e4084371c9b8f3651cf7cc87960172babfb6_dGVzdHMvdGVzdC1zY2hlZHVsZXIudA== 100644
--- a/tests/test-scheduler.t
+++ b/tests/test-scheduler.t
@@ -63,3 +63,31 @@
   * Ending 'RUN' 'tip' (glob)
   * Starting 'EXIT' None (glob)
   * Ending 'EXIT' None (glob)
+
+Test scheduler bisect task
+
+  $ cat << EOF >> TASKS
+  > BISECT tip..tip~2 track_startup
+  > EXIT
+  > EOF
+
+  $ python $TESTDIR/../scheduler.py TASKS
+  ================================================================================
+  Got task 'BISECT' 'tip..tip~2 track_startup'
+  Unknown task BISECT
+  
+  
+  
+  Removed task 'BISECT tip..tip~2 track_startup'
+  ================================================================================
+  ================================================================================
+  Got task 'EXIT' None
+  
+  
+  
+  Removed task 'EXIT'
+  ================================================================================
+
+Scheduler should exit and the TASKS file should be now empty
+
+  $ cat TASKS