diff --git a/src/coordinator.rs b/src/coordinator.rs
index b2508d7..94768ce 100644
--- a/src/coordinator.rs
+++ b/src/coordinator.rs
@@ -112,7 +112,7 @@ async fn handle_stream_request(
         &IncomingStreamRequest::Begin(ref begin) if begin.port() == COORDINATOR_PORT => {
             if let Ok(onion_service_stream) = stream_request.accept(Connected::new_empty()).await {
                 let io = TokioIo::new(onion_service_stream);
-                if let Ok(_) = http1::Builder::new()
+                match http1::Builder::new()
                     .serve_connection(
                         io,
                         service_fn(|request| {
@@ -120,7 +120,10 @@ async fn handle_stream_request(
                         }),
                     )
                     .await
-                {}
+                {
+                    Ok(_) => {}
+                    Err(e) => log::debug!("Failed to serve connection: {:?}", e),
+                }
             }
         }
         _ => {
diff --git a/src/main.rs b/src/main.rs
index 78cec3b..d2c411c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -108,7 +108,7 @@ async fn main() {
         }
         None => {
             log::debug!("No keypair found in db, generating one");
-            let keypair = SnowKeypair::new();
+            let keypair = SnowKeypair::new().expect("Failed to generate keypair");
             db.insert("private_key", bincode::serialize(&keypair).unwrap())
                 .unwrap();
             keypair
diff --git a/src/session.rs b/src/session.rs
index 919d4ce..90bf192 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -53,9 +53,17 @@ impl UpdatablePendingSession {
                     log::info!("Terminating pending session {}", id);
                 }
                 session = socket.connect(id, info.conn_info.clone()) => {
-                    if let Err(e) = session_sender.send((session, info)).await {
-                        log::warn!("Error sending session: {}", e);
+                    match session {
+                        Ok(session) => {
+                            if let Err(e) = session_sender.send((session, info)).await {
+                                log::warn!("Error sending session: {}", e);
+                            }
+                        },
+                        Err(e) => {
+                            log::warn!("Error connecting session: {e}");
+                        }
                     }
+                    
                 }
             }
         });