diff --git a/src/runtime2/scheduler.rs b/src/runtime2/scheduler.rs
index 092b65f090107f47fe0c48f9656a99c6f473e2e6..22299972b63d32556f9f855b82fd5f9e73066e32 100644
--- a/src/runtime2/scheduler.rs
+++ b/src/runtime2/scheduler.rs
@@ -48,7 +48,7 @@ impl Scheduler {
             // Keep running until we should no longer immediately schedule the
             // connector.
             let mut cur_schedule = ConnectorScheduling::Immediate;
-            while cur_schedule == ConnectorScheduling::Immediate {
+            while let ConnectorScheduling::Immediate = cur_schedule {
                 self.handle_inbox_messages(scheduled);
 
                 // Run the main behaviour of the connector, depending on its
@@ -115,6 +115,11 @@ impl Scheduler {
                     }
 
                     self.try_go_to_sleep(connector_key, scheduled);
+                },
+                ConnectorScheduling::Error(eval_error) => {
+                    // Display error. Then exit
+                    println!("Oh oh!\n{}", eval_error);
+                    panic!("Abort!");
                 }
             }
         }