diff --git a/src/file_server.rs b/src/file_server.rs
index 39fff19..ecdfe6c 100644
--- a/src/file_server.rs
+++ b/src/file_server.rs
@@ -42,8 +42,7 @@ pub(crate) async fn static_file_server(path: PathBuf) -> Result<SocketAddr, Prox
     tracing::info!("Statically serving {path:?} on {addr}");
 
     tokio::spawn(async move {
-        if let Err(err) = axum::serve(tokio::net::TcpListener::bind(addr).await.unwrap(), app).await
-        {
+        if let Err(err) = axum::serve(listener, app).await {
             tracing::error!("HTTP file server: {err}");
         }
     });
diff --git a/src/health_check.rs b/src/health_check.rs
index b0f9293..90a9d29 100644
--- a/src/health_check.rs
+++ b/src/health_check.rs
@@ -31,7 +31,9 @@ pub async fn server(listen_addr: SocketAddr) -> anyhow::Result<SocketAddr> {
     tracing::info!("Starting health check server at {}", listen_addr);
 
     tokio::spawn(async move {
-        axum::serve(listener, app).await.unwrap();
+        if let Err(err) = axum::serve(listener, app).await {
+            tracing::error!("Health check server closed: {err}");
+        }
     });
 
     Ok(listen_addr)