diff --git a/src/Wolverine/Tracking/TrackedSession.cs b/src/Wolverine/Tracking/TrackedSession.cs
index 5d1329e48..63406c6bb 100644
--- a/src/Wolverine/Tracking/TrackedSession.cs
+++ b/src/Wolverine/Tracking/TrackedSession.cs
@@ -316,8 +316,8 @@ private void writeGrid(Grid<EnvelopeRecord> grid, EnvelopeRecord[] records, Stri
             grid.AddColumn("Service (Node Id)", x => $"{x.ServiceName} ({x.UniqueNodeId})");
         }
 
-        grid.AddColumn("Message Id", x => x.Envelope.Id.ToString());
-        grid.AddColumn("Message Type", x => x.Envelope.MessageType ?? string.Empty);
+        grid.AddColumn("Message Id", x => x.Envelope?.Id.ToString() ?? string.Empty);
+        grid.AddColumn("Message Type", x => x.Envelope?.MessageType ?? string.Empty);
         grid.AddColumn("Time (ms)", x => x.SessionTime.ToString(), true);
 
         grid.AddColumn("Event", x => x.MessageEventType.ToString());