diff --git a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
index a018164657..93f2d0c86d 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
@@ -921,13 +921,17 @@ impl<R, S> FreshHandler<R, S> {
             span.set_parent(remote_context);
             Some(span)
         } else {
+            warn!("COULDN'T FIND TRACE_ID");
             None
         };
 
         // Probably a nicer way to do this but for now just match
         let _guard = match &span {
             Some(s) => Some(s.enter()),
-            None => None,
+            None => {
+                warn!("COULDN'T ENTER SPAN");
+                None
+            }
         };
 
         // we can handle stateless client requests without prior authentication, like `ClientControlRequest::SupportedProtocol`
diff --git a/nym-node/src/cli/mod.rs b/nym-node/src/cli/mod.rs
index 6bc3ef0ddd..15a67856e4 100644
--- a/nym-node/src/cli/mod.rs
+++ b/nym-node/src/cli/mod.rs
@@ -154,6 +154,7 @@ pub(crate) enum Commands {
 
     /// Test local tracing for instrumentation and
     /// TraceID aligmnet
+    // TODO this needs to just start and then wait for the shutdown signal - grab from run()
     TestTracing,
 }