diff --git a/demo-shell/src/app/components/log/log.component.ts b/demo-shell/src/app/components/log/log.component.ts
index 1db5c71141..e7cfd522e0 100644
--- a/demo-shell/src/app/components/log/log.component.ts
+++ b/demo-shell/src/app/components/log/log.component.ts
@@ -32,13 +32,18 @@ export class LogComponent {
     constructor(public logService: LogService) {
 
         logService.onMessage.subscribe((message) => {
-            if (typeof message.text === 'string') {
-                this.logs.push({ type: message.type, text: JSON.stringify(message.text) });
-                this.logsData = new ObjectDataTableAdapter(this.logs, [
-                    { type: 'text', key: 'type', title: 'Log level', sortable: true },
-                    { type: 'text', key: 'text', title: 'Message', sortable: false }
-                ]);
+            let contentMessage = '';
+            try {
+                contentMessage = JSON.stringify(message.text);
+            } catch (error) {
+                return;
             }
+            this.logs.push({ type: message.type, text: contentMessage});
+            this.logsData = new ObjectDataTableAdapter(this.logs, [
+                { type: 'text', key: 'type', title: 'Log level', sortable: true },
+                { type: 'text', key: 'text', title: 'Message', sortable: false }
+            ]);
+
         });
     }