diff --git a/src/entities/var-dump/lib/normalize-var-dump-event.ts b/src/entities/var-dump/lib/normalize-var-dump-event.ts
index 39a477e..ccf402f 100644
--- a/src/entities/var-dump/lib/normalize-var-dump-event.ts
+++ b/src/entities/var-dump/lib/normalize-var-dump-event.ts
@@ -8,9 +8,9 @@ export const normalizeVarDumpEvent = (event: ServerEvent<VarDump>): NormalizedEv
     type: EVENT_TYPES.VAR_DUMP,
     labels: [EVENT_TYPES.VAR_DUMP],
     origin: {
-      file: event.payload.context?.source.file,
-      name: event.payload.context?.source.name,
-      line_number: event.payload.context?.source.line,
+      file: event.payload.context?.source?.file || "",
+      name: event.payload.context?.source?.name || "",
+      line_number: event.payload.context?.source?.line || "",
     },
     serverName: "",
     date: event.timestamp ? new Date(event.timestamp * 1000) : null,
@@ -21,5 +21,9 @@ export const normalizeVarDumpEvent = (event: ServerEvent<VarDump>): NormalizedEv
     normalizedEvent.labels.push(`label: ${event.payload.payload.label}`);
   }
 
+  if (event.payload?.context?.cli) {
+    normalizedEvent.labels.push(`CLI: ${event.payload.context.cli}`);
+  }
+
   return normalizedEvent;
 }