diff --git a/src/server.rs b/src/server.rs
index 404d592269b3ff46a95051b9f6d85bb21ab5e572..98996b49116331f105af813b2e8c0a3f10fb8a31 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -108,17 +108,11 @@ impl Server {
 
       let _ = tx.send(srv.handle());
 
-      rt.block_on(async { srv.await });
+      rt.block_on(async { srv.await }).context(SystemRun)?;
 
       Ok(())
-
-      //log::debug!("Starting server event loop");
-
-      //sys.run().context(SystemRun)
     });
 
-    log::debug!("!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-
     Ok((
       rx.recv().context(ChannelReceive)?,
       join_handle,
diff --git a/src/stats.rs b/src/stats.rs
index ffac89660b6568731903e7eb89bd99eb7bce7f08..835fe1b8c0fad2c7a2fa6ffd458294350b121c66 100644
--- a/src/stats.rs
+++ b/src/stats.rs
@@ -70,7 +70,7 @@ impl StatsServer {
 
       rt.block_on(async {
         srv.await
-      });
+      }).context(SystemRun)?;
 
       Ok(())
     });