diff --git a/devtools/src/layer.rs b/devtools/src/layer.rs
index 7e52a59c..167353fc 100644
--- a/devtools/src/layer.rs
+++ b/devtools/src/layer.rs
@@ -111,7 +111,7 @@ where
             Event::Event {
                 at,
                 metadata,
-                message,
+                message: message.unwrap_or_default(),
                 fields,
                 maybe_parent,
             }
diff --git a/devtools/src/visitors.rs b/devtools/src/visitors.rs
index e0cf8a75..7f54b226 100644
--- a/devtools/src/visitors.rs
+++ b/devtools/src/visitors.rs
@@ -35,11 +35,8 @@ impl EventVisitor {
             message: None,
         }
     }
-    pub(crate) fn result(self) -> (String, Vec<Field>) {
-        (
-            self.message.unwrap(), // TODO handle result here
-            self.field_visitor.result(),
-        )
+    pub(crate) fn result(self) -> (Option<String>, Vec<Field>) {
+        (self.message, self.field_visitor.result())
     }
 }