diff --git a/zebrad/src/components/metrics.rs b/zebrad/src/components/metrics.rs
index 04769d58c21..238a4b87ecf 100644
--- a/zebrad/src/components/metrics.rs
+++ b/zebrad/src/components/metrics.rs
@@ -22,7 +22,7 @@ impl MetricsEndpoint {
                     "{} {} {}",
                     "Port for metrics endpoint already in use by another process:",
                     addr,
-                    "- You can change the metrics default endpoint in the config."
+                    "- You can change the metrics endpoint in the config."
                 ),
             }
         }
diff --git a/zebrad/src/components/tracing/endpoint.rs b/zebrad/src/components/tracing/endpoint.rs
index 353bd0ba60a..425a8c599fd 100644
--- a/zebrad/src/components/tracing/endpoint.rs
+++ b/zebrad/src/components/tracing/endpoint.rs
@@ -55,11 +55,12 @@ impl TracingEndpoint {
                 // need to construct it inside the task.
                 let server = match Server::try_bind(&addr) {
                     Ok(s) => s,
-                    Err(e) => {
-                        error!("Could not open tracing endpoint listener");
-                        error!("Error: {}", e);
-                        return;
-                    }
+                    Err(_) => panic!(
+                        "{} {} {}",
+                        "Port for tracing endpoint already in use by another process:",
+                        addr,
+                        "- You can change the tracing endpoint port in the config."
+                    ),
                 }
                 .serve(service);