diff --git a/bin/commit_boost.rs b/bin/commit_boost.rs
index e2ac2beb..880debb3 100644
--- a/bin/commit_boost.rs
+++ b/bin/commit_boost.rs
@@ -11,9 +11,5 @@ async fn main() -> eyre::Result<()> {
 
     let args = cb_cli::Args::parse();
 
-    if let Err(err) = args.run().await {
-        eprintln!("Error: {err}");
-        std::process::exit(1)
-    };
-    Ok(())
+    args.run().await
 }
diff --git a/bin/default_pbs.rs b/bin/default_pbs.rs
index 0e5bf8a3..5412e254 100644
--- a/bin/default_pbs.rs
+++ b/bin/default_pbs.rs
@@ -18,6 +18,5 @@ async fn main() -> Result<()> {
     let state = PbsState::<()>::new(pbs_config);
 
     PbsService::init_metrics()?;
-    PbsService::run::<(), DefaultBuilderApi>(state).await;
-    Ok(())
+    PbsService::run::<(), DefaultBuilderApi>(state).await
 }
diff --git a/crates/pbs/src/service.rs b/crates/pbs/src/service.rs
index b23063be..d3f1f7f5 100644
--- a/crates/pbs/src/service.rs
+++ b/crates/pbs/src/service.rs
@@ -1,10 +1,10 @@
 use std::net::SocketAddr;
 
 use cb_metrics::provider::MetricsProvider;
-use eyre::Result;
+use eyre::{Context, Result};
 use prometheus::core::Collector;
 use tokio::net::TcpListener;
-use tracing::{error, info};
+use tracing::info;
 
 use crate::{
     api::BuilderApi,
@@ -18,7 +18,7 @@ pub struct PbsService;
 // TODO: add ServerMaxHeaderBytes
 
 impl PbsService {
-    pub async fn run<S: BuilderApiState, T: BuilderApi<S>>(state: PbsState<S>) {
+    pub async fn run<S: BuilderApiState, T: BuilderApi<S>>(state: PbsState<S>) -> Result<()> {
         // if state.pbs_config().relay_check {
         //     PbsService::relay_check(state.relays()).await;
         // }
@@ -32,9 +32,7 @@ impl PbsService {
 
         let listener = TcpListener::bind(address).await.expect("failed tcp binding");
 
-        if let Err(err) = axum::serve(listener, app).await {
-            error!(?err, "Pbs server exited")
-        }
+        axum::serve(listener, app).await.wrap_err("PBS server exited")
     }
 
     pub fn register_metric(c: Box<dyn Collector>) {