diff --git a/src/main.rs b/src/main.rs
index 36cd1b5d..14965ad5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -445,6 +445,8 @@ impl Future for Main {
                 if !self.shutdown {
                     if let Some(ref spirc) = self.spirc {
                         spirc.shutdown();
+                    } else {
+                        return Ok(Async::Ready(()));
                     }
                     self.shutdown = true;
                 } else {