diff --git a/src/websrc/myesp.js b/src/websrc/myesp.js
index 0816d9db9..7533b8463 100644
--- a/src/websrc/myesp.js
+++ b/src/websrc/myesp.js
@@ -544,12 +544,17 @@ function twoDigits(value) {
 function initEventTable() {
     var newlist = [];
     for (var i = 0; i < data.length; i++) {
-        var dup = JSON.parse(data[i]);
-        dup.uid = i;
         newlist[i] = {};
         newlist[i].options = {};
         newlist[i].value = {};
+        try {
+            var dup = JSON.parse(data[i]);
+            dup.uid = i + 1;
+        } catch (e) {
+            var dup = { "uid": i, "type": "ERRO", "src": "SYS", "desc": "Error in logfile entry", "data": data[i], "time": 1 }
+        }
         newlist[i].value = dup;
+
         var c = dup.type;
         switch (c) {
             case "WARN":
@@ -564,7 +569,6 @@ function initEventTable() {
             default:
                 break;
         }
-
     }
     jQuery(function ($) {
         window.FooTable.init("#eventtable", {
diff --git a/tools/wsemulator/wserver.js b/tools/wsemulator/wserver.js
index 8e14990f7..4aaa0147a 100644
--- a/tools/wsemulator/wserver.js
+++ b/tools/wsemulator/wserver.js
@@ -51,18 +51,11 @@ var eventlog = {
     "command": "eventlist",
     "page": 1,
     "haspages": 1,
-    "list": [
-        "{ \"type\": \"WARN\", \"src\": \"sys\", \"desc\": \"Event log cleared!\", \"data\": \"\", \"time\": 1563371160 }",
-        "{ \"type\": \"WARN\", \"src\": \"sys\", \"desc\": \"Event log cleared!\", \"data\": \"\", \"time\": 1563371160 }",
-        "{ \"type\": \"INFO\", \"src\": \"wifi\", \"desc\": \"WiFi is connected\", \"data\": \"SMC\", \"time\": 13 }",
-        "{ \"type\": \"INFO\", \"src\": \"sys\", \"desc\": \"System setup completed, running\", \"data\": \"\", \"time\": 13 }",
-        "{ \"type\": \"INFO\", \"src\": \"wifi\", \"desc\": \"WiFi is connected\", \"data\": \"SMC\", \"time\": 13 }",
-        "{ \"type\": \"INFO\", \"src\": \"sys\", \"desc\": \"System setup completed, running\", \"data\": \"\", \"time\": 13 }",
-        "{ \"type\": \"WARN\", \"src\": \"websrv\", \"desc\": \"New login attempt\", \"data\": \"\", \"time\": 1563371160 }",
-        "{ \"type\": \"INFO\", \"src\": \"websrv\", \"desc\": \"Login success!\", \"data\": \"\", \"time\": 1563371160 }",
-        "{ \"type\": \"INFO\", \"src\": \"wifi\", \"desc\": \"WiFi is connected\", \"data\": \"SMC\", \"time\": 13 }",
-        "{ \"type\": \"INFO\", \"src\": \"sys\", \"desc\": \"System setup completed, running\", \"data\": \"\", \"time\": 13 }",
-        "{ \"type\": \"WARN\", \"src\": \"websrv\", \"desc\": \"New login attempt\", \"data\": \"\", \"time\": 1563371160 }"
+    "list":[
+        "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #1\",\"time\": 1563371160}",
+        "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #2\",\"time\":0}",
+        "{\"type\":\"INFO\",\"src\":\"system\",\"desc\":\"System booted\",\"data\":\"\",\"time\":1568660479}",
+        "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #3\",\"time\":0}"
     ]
 }