diff --git a/utils/message-generator/README.md b/utils/message-generator/README.md
index 0f9361b311..e4d797ee26 100644
--- a/utils/message-generator/README.md
+++ b/utils/message-generator/README.md
@@ -1,5 +1,6 @@
 # Message Generator
 
+
 Little utility to execute interoperability tests between SRI and other Sv2 complaint software.   
 
 ## Try it
diff --git a/utils/message-generator/src/main.rs b/utils/message-generator/src/main.rs
index 3a7cca5e18..695b3919cd 100644
--- a/utils/message-generator/src/main.rs
+++ b/utils/message-generator/src/main.rs
@@ -26,7 +26,7 @@ use std::{
     },
     vec::Vec,
 };
-use tracing::info;
+use tracing::{error, info};
 use tracing_core::{Event, Subscriber};
 use tracing_subscriber::{
     filter::EnvFilter,
@@ -408,7 +408,8 @@ async fn main() {
     let pass = Arc::new(AtomicBool::new(false));
     {
         let fail = fail.clone();
-        std::panic::set_hook(Box::new(move |_| {
+        std::panic::set_hook(Box::new(move |info| {
+            error!("{:#?}", info);
             fail.store(true, Ordering::Relaxed);
         }));
     }
@@ -430,6 +431,7 @@ async fn main() {
         });
     }
     loop {
+        tokio::task::yield_now().await;
         if fail.load(Ordering::Relaxed) {
             clean_up(cleanup).await;
             let _ = std::panic::take_hook();