diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
index 81664432046c..3aa7243f5fa5 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
@@ -109,7 +109,7 @@ function getCleanedPacket(key, packet) {
       }
     }
 
-    if (res.result) {
+    if (res.result && existingPacket.result) {
       // Clean actor ids on evaluation result messages.
       res.result.actor = existingPacket.result.actor;
       if (res.result.preview) {
@@ -120,9 +120,12 @@ function getCleanedPacket(key, packet) {
       }
     }
 
-    if (res.exception) {
+    if (res.exception && existingPacket.exception) {
       // Clean actor ids on exception messages.
-      res.exception.actor = existingPacket.exception.actor;
+      if (existingPacket.exception.actor) {
+        res.exception.actor = existingPacket.exception.actor;
+      }
+
       if (res.exception.preview) {
         if (res.exception.preview.timestamp) {
           // Clean timestamp there too.
@@ -234,7 +237,7 @@ function getCleanedPacket(key, packet) {
 
 function formatPacket(key, packet) {
   let stringifiedPacket = JSON.stringify(getCleanedPacket(key, packet), null, 2);
-  return `stubPackets.set("${key}", ${stringifiedPacket});`;
+  return `stubPackets.set(\`${key}\`, ${stringifiedPacket});`;
 }
 
 function formatStub(key, packet) {
@@ -243,7 +246,8 @@ function formatStub(key, packet) {
     {getNextId: () => "1"}
   );
   let stringifiedMessage = JSON.stringify(prepared, null, 2);
-  return `stubPreparedMessages.set("${key}", new ConsoleMessage(${stringifiedMessage}));`;
+  return (
+    `stubPreparedMessages.set(\`${key}\`, new ConsoleMessage(${stringifiedMessage}));`);
 }
 
 function formatNetworkEventStub(key, packet) {
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
index 63ceed060521..df898c6f073b 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/stub-snippets.js
@@ -185,6 +185,9 @@ let evaluationResult = new Map(evaluationResultCommands.map(cmd => [cmd, cmd]));
 evaluationResult.set("longString message Error",
   `throw new Error("Long error ".repeat(10000))`);
 
+evaluationResult.set(`eval throw ""`, `throw ""`);
+evaluationResult.set(`eval throw "tomato"`, `throw "tomato"`);
+
 // Network Event
 
 let networkEvent = new Map();
@@ -234,6 +237,9 @@ pageError.set("SyntaxError: redeclaration of let a", `
 pageError.set("TypeError longString message",
   `throw new Error("Long error ".repeat(10000))`);
 
+pageError.set(`throw ""`, `throw ""`);
+pageError.set(`throw "tomato"`, `throw "tomato"`);
+
 module.exports = {
   consoleApi,
   cssMessage,
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
index fecfcd0f9146..300b663fba64 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/consoleApi.js
@@ -13,7 +13,7 @@ const { ConsoleMessage } =
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-stubPreparedMessages.set("console.log('foobar', 'test')", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('foobar', 'test')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -40,7 +40,7 @@ stubPreparedMessages.set("console.log('foobar', 'test')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log(undefined)", new ConsoleMessage({
+stubPreparedMessages.set(`console.log(undefined)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -68,7 +68,7 @@ stubPreparedMessages.set("console.log(undefined)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.warn('danger, will robinson!')", new ConsoleMessage({
+stubPreparedMessages.set(`console.warn('danger, will robinson!')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -94,7 +94,7 @@ stubPreparedMessages.set("console.warn('danger, will robinson!')", new ConsoleMe
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log(NaN)", new ConsoleMessage({
+stubPreparedMessages.set(`console.log(NaN)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -122,7 +122,7 @@ stubPreparedMessages.set("console.log(NaN)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log(null)", new ConsoleMessage({
+stubPreparedMessages.set(`console.log(null)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -150,7 +150,7 @@ stubPreparedMessages.set("console.log(null)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('鼬')", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('鼬')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -176,7 +176,7 @@ stubPreparedMessages.set("console.log('鼬')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.clear()", new ConsoleMessage({
+stubPreparedMessages.set(`console.clear()`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -202,7 +202,7 @@ stubPreparedMessages.set("console.clear()", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count('bar')", new ConsoleMessage({
+stubPreparedMessages.set(`console.count('bar')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -226,7 +226,7 @@ stubPreparedMessages.set("console.count('bar')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.assert(false, {message: 'foobar'})", new ConsoleMessage({
+stubPreparedMessages.set(`console.assert(false, {message: 'foobar'})`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -282,7 +282,7 @@ stubPreparedMessages.set("console.assert(false, {message: 'foobar'})", new Conso
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('hello \nfrom \rthe \"string world!')", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('hello \nfrom \rthe \"string world!')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -308,7 +308,7 @@ stubPreparedMessages.set("console.log('hello \nfrom \rthe \"string world!')", ne
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('úṇĩçödê țĕșť')", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('úṇĩçödê țĕșť')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -334,7 +334,7 @@ stubPreparedMessages.set("console.log('úṇĩçödê țĕșť')", new ConsoleMe
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.dirxml(window)", new ConsoleMessage({
+stubPreparedMessages.set(`console.dirxml(window)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -372,7 +372,7 @@ stubPreparedMessages.set("console.dirxml(window)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('myarray', ['red', 'green', 'blue'])", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('myarray', ['red', 'green', 'blue'])`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -416,7 +416,7 @@ stubPreparedMessages.set("console.log('myarray', ['red', 'green', 'blue'])", new
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('myregex', /a.b.c/)", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('myregex', /a.b.c/)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -452,7 +452,7 @@ stubPreparedMessages.set("console.log('myregex', /a.b.c/)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.table(['red', 'green', 'blue']);", new ConsoleMessage({
+stubPreparedMessages.set(`console.table(['red', 'green', 'blue']);`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -495,7 +495,7 @@ stubPreparedMessages.set("console.table(['red', 'green', 'blue']);", new Console
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('myobject', {red: 'redValue', green: 'greenValue', blue: 'blueValue'});", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('myobject', {red: 'redValue', green: 'greenValue', blue: 'blueValue'});`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -557,7 +557,7 @@ stubPreparedMessages.set("console.log('myobject', {red: 'redValue', green: 'gree
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.debug('debug message');", new ConsoleMessage({
+stubPreparedMessages.set(`console.debug('debug message');`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -583,7 +583,7 @@ stubPreparedMessages.set("console.debug('debug message');", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.info('info message');", new ConsoleMessage({
+stubPreparedMessages.set(`console.info('info message');`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -609,7 +609,7 @@ stubPreparedMessages.set("console.info('info message');", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.error('error message');", new ConsoleMessage({
+stubPreparedMessages.set(`console.error('error message');`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -642,7 +642,7 @@ stubPreparedMessages.set("console.error('error message');", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('mymap')", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('mymap')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -691,7 +691,7 @@ stubPreparedMessages.set("console.log('mymap')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log('myset')", new ConsoleMessage({
+stubPreparedMessages.set(`console.log('myset')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -734,7 +734,7 @@ stubPreparedMessages.set("console.log('myset')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.trace()", new ConsoleMessage({
+stubPreparedMessages.set(`console.trace()`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -777,7 +777,7 @@ stubPreparedMessages.set("console.trace()", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.time('bar')", new ConsoleMessage({
+stubPreparedMessages.set(`console.time('bar')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -801,7 +801,7 @@ stubPreparedMessages.set("console.time('bar')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("timerAlreadyExists", new ConsoleMessage({
+stubPreparedMessages.set(`timerAlreadyExists`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -825,7 +825,7 @@ stubPreparedMessages.set("timerAlreadyExists", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.timeEnd('bar')", new ConsoleMessage({
+stubPreparedMessages.set(`console.timeEnd('bar')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -849,7 +849,7 @@ stubPreparedMessages.set("console.timeEnd('bar')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("timerDoesntExist", new ConsoleMessage({
+stubPreparedMessages.set(`timerDoesntExist`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -873,7 +873,7 @@ stubPreparedMessages.set("timerDoesntExist", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.table('bar')", new ConsoleMessage({
+stubPreparedMessages.set(`console.table('bar')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -899,7 +899,7 @@ stubPreparedMessages.set("console.table('bar')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.table(['a', 'b', 'c'])", new ConsoleMessage({
+stubPreparedMessages.set(`console.table(['a', 'b', 'c'])`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -942,7 +942,7 @@ stubPreparedMessages.set("console.table(['a', 'b', 'c'])", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.group('bar')", new ConsoleMessage({
+stubPreparedMessages.set(`console.group('bar')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -968,7 +968,7 @@ stubPreparedMessages.set("console.group('bar')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.groupEnd('bar')", new ConsoleMessage({
+stubPreparedMessages.set(`console.groupEnd('bar')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -992,7 +992,7 @@ stubPreparedMessages.set("console.groupEnd('bar')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.groupCollapsed('foo')", new ConsoleMessage({
+stubPreparedMessages.set(`console.groupCollapsed('foo')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1018,7 +1018,7 @@ stubPreparedMessages.set("console.groupCollapsed('foo')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.groupEnd('foo')", new ConsoleMessage({
+stubPreparedMessages.set(`console.groupEnd('foo')`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1042,7 +1042,7 @@ stubPreparedMessages.set("console.groupEnd('foo')", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.group()", new ConsoleMessage({
+stubPreparedMessages.set(`console.group()`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1068,7 +1068,7 @@ stubPreparedMessages.set("console.group()", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.groupEnd()", new ConsoleMessage({
+stubPreparedMessages.set(`console.groupEnd()`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1092,7 +1092,7 @@ stubPreparedMessages.set("console.groupEnd()", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.log(%cfoobar)", new ConsoleMessage({
+stubPreparedMessages.set(`console.log(%cfoobar)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1122,7 +1122,7 @@ stubPreparedMessages.set("console.log(%cfoobar)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.group(%cfoo%cbar)", new ConsoleMessage({
+stubPreparedMessages.set(`console.group(%cfoo%cbar)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1152,7 +1152,7 @@ stubPreparedMessages.set("console.group(%cfoo%cbar)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.groupEnd(%cfoo%cbar)", new ConsoleMessage({
+stubPreparedMessages.set(`console.groupEnd(%cfoo%cbar)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1176,7 +1176,7 @@ stubPreparedMessages.set("console.groupEnd(%cfoo%cbar)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.groupCollapsed(%cfoo%cbaz)", new ConsoleMessage({
+stubPreparedMessages.set(`console.groupCollapsed(%cfoo%cbaz)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1206,7 +1206,7 @@ stubPreparedMessages.set("console.groupCollapsed(%cfoo%cbaz)", new ConsoleMessag
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.groupEnd(%cfoo%cbaz)", new ConsoleMessage({
+stubPreparedMessages.set(`console.groupEnd(%cfoo%cbaz)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1230,7 +1230,7 @@ stubPreparedMessages.set("console.groupEnd(%cfoo%cbaz)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.dir({C, M, Y, K})", new ConsoleMessage({
+stubPreparedMessages.set(`console.dir({C, M, Y, K})`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1297,7 +1297,7 @@ stubPreparedMessages.set("console.dir({C, M, Y, K})", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | default: 1", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | default: 1`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1321,7 +1321,7 @@ stubPreparedMessages.set("console.count | default: 1", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | default: 2", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | default: 2`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1345,7 +1345,7 @@ stubPreparedMessages.set("console.count | default: 2", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | test counter: 1", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | test counter: 1`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1369,7 +1369,7 @@ stubPreparedMessages.set("console.count | test counter: 1", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | test counter: 2", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | test counter: 2`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1393,7 +1393,7 @@ stubPreparedMessages.set("console.count | test counter: 2", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | default: 3", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | default: 3`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1417,7 +1417,7 @@ stubPreparedMessages.set("console.count | default: 3", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | clear", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | clear`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1443,7 +1443,7 @@ stubPreparedMessages.set("console.count | clear", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | default: 4", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | default: 4`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1467,7 +1467,7 @@ stubPreparedMessages.set("console.count | default: 4", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("console.count | test counter: 3", new ConsoleMessage({
+stubPreparedMessages.set(`console.count | test counter: 3`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "console-api",
@@ -1491,7 +1491,7 @@ stubPreparedMessages.set("console.count | test counter: 3", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPackets.set("console.log('foobar', 'test')", {
+stubPackets.set(`console.log('foobar', 'test')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1517,7 +1517,7 @@ stubPackets.set("console.log('foobar', 'test')", {
   }
 });
 
-stubPackets.set("console.log(undefined)", {
+stubPackets.set(`console.log(undefined)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1544,7 +1544,7 @@ stubPackets.set("console.log(undefined)", {
   }
 });
 
-stubPackets.set("console.warn('danger, will robinson!')", {
+stubPackets.set(`console.warn('danger, will robinson!')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1569,7 +1569,7 @@ stubPackets.set("console.warn('danger, will robinson!')", {
   }
 });
 
-stubPackets.set("console.log(NaN)", {
+stubPackets.set(`console.log(NaN)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1596,7 +1596,7 @@ stubPackets.set("console.log(NaN)", {
   }
 });
 
-stubPackets.set("console.log(null)", {
+stubPackets.set(`console.log(null)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1623,7 +1623,7 @@ stubPackets.set("console.log(null)", {
   }
 });
 
-stubPackets.set("console.log('鼬')", {
+stubPackets.set(`console.log('鼬')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1648,7 +1648,7 @@ stubPackets.set("console.log('鼬')", {
   }
 });
 
-stubPackets.set("console.clear()", {
+stubPackets.set(`console.clear()`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1671,7 +1671,7 @@ stubPackets.set("console.clear()", {
   }
 });
 
-stubPackets.set("console.count('bar')", {
+stubPackets.set(`console.count('bar')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1699,7 +1699,7 @@ stubPackets.set("console.count('bar')", {
   }
 });
 
-stubPackets.set("console.assert(false, {message: 'foobar'})", {
+stubPackets.set(`console.assert(false, {message: 'foobar'})`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1755,7 +1755,7 @@ stubPackets.set("console.assert(false, {message: 'foobar'})", {
   }
 });
 
-stubPackets.set("console.log('hello \nfrom \rthe \"string world!')", {
+stubPackets.set(`console.log('hello \nfrom \rthe \"string world!')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1780,7 +1780,7 @@ stubPackets.set("console.log('hello \nfrom \rthe \"string world!')", {
   }
 });
 
-stubPackets.set("console.log('úṇĩçödê țĕșť')", {
+stubPackets.set(`console.log('úṇĩçödê țĕșť')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1805,7 +1805,7 @@ stubPackets.set("console.log('úṇĩçödê țĕșť')", {
   }
 });
 
-stubPackets.set("console.dirxml(window)", {
+stubPackets.set(`console.dirxml(window)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1842,7 +1842,7 @@ stubPackets.set("console.dirxml(window)", {
   }
 });
 
-stubPackets.set("console.log('myarray', ['red', 'green', 'blue'])", {
+stubPackets.set(`console.log('myarray', ['red', 'green', 'blue'])`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1885,7 +1885,7 @@ stubPackets.set("console.log('myarray', ['red', 'green', 'blue'])", {
   }
 });
 
-stubPackets.set("console.log('myregex', /a.b.c/)", {
+stubPackets.set(`console.log('myregex', /a.b.c/)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1920,7 +1920,7 @@ stubPackets.set("console.log('myregex', /a.b.c/)", {
   }
 });
 
-stubPackets.set("console.table(['red', 'green', 'blue']);", {
+stubPackets.set(`console.table(['red', 'green', 'blue']);`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -1962,7 +1962,7 @@ stubPackets.set("console.table(['red', 'green', 'blue']);", {
   }
 });
 
-stubPackets.set("console.log('myobject', {red: 'redValue', green: 'greenValue', blue: 'blueValue'});", {
+stubPackets.set(`console.log('myobject', {red: 'redValue', green: 'greenValue', blue: 'blueValue'});`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2023,7 +2023,7 @@ stubPackets.set("console.log('myobject', {red: 'redValue', green: 'greenValue',
   }
 });
 
-stubPackets.set("console.debug('debug message');", {
+stubPackets.set(`console.debug('debug message');`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2048,7 +2048,7 @@ stubPackets.set("console.debug('debug message');", {
   }
 });
 
-stubPackets.set("console.info('info message');", {
+stubPackets.set(`console.info('info message');`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2073,7 +2073,7 @@ stubPackets.set("console.info('info message');", {
   }
 });
 
-stubPackets.set("console.error('error message');", {
+stubPackets.set(`console.error('error message');`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2106,7 +2106,7 @@ stubPackets.set("console.error('error message');", {
   }
 });
 
-stubPackets.set("console.log('mymap')", {
+stubPackets.set(`console.log('mymap')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2154,7 +2154,7 @@ stubPackets.set("console.log('mymap')", {
   }
 });
 
-stubPackets.set("console.log('myset')", {
+stubPackets.set(`console.log('myset')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2196,7 +2196,7 @@ stubPackets.set("console.log('myset')", {
   }
 });
 
-stubPackets.set("console.trace()", {
+stubPackets.set(`console.trace()`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2239,7 +2239,7 @@ stubPackets.set("console.trace()", {
   }
 });
 
-stubPackets.set("console.time('bar')", {
+stubPackets.set(`console.time('bar')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2266,7 +2266,7 @@ stubPackets.set("console.time('bar')", {
   }
 });
 
-stubPackets.set("timerAlreadyExists", {
+stubPackets.set(`timerAlreadyExists`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2294,7 +2294,7 @@ stubPackets.set("timerAlreadyExists", {
   }
 });
 
-stubPackets.set("console.timeEnd('bar')", {
+stubPackets.set(`console.timeEnd('bar')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2322,7 +2322,7 @@ stubPackets.set("console.timeEnd('bar')", {
   }
 });
 
-stubPackets.set("timerDoesntExist", {
+stubPackets.set(`timerDoesntExist`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2350,7 +2350,7 @@ stubPackets.set("timerDoesntExist", {
   }
 });
 
-stubPackets.set("console.table('bar')", {
+stubPackets.set(`console.table('bar')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2375,7 +2375,7 @@ stubPackets.set("console.table('bar')", {
   }
 });
 
-stubPackets.set("console.table(['a', 'b', 'c'])", {
+stubPackets.set(`console.table(['a', 'b', 'c'])`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2417,7 +2417,7 @@ stubPackets.set("console.table(['a', 'b', 'c'])", {
   }
 });
 
-stubPackets.set("console.group('bar')", {
+stubPackets.set(`console.group('bar')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2442,7 +2442,7 @@ stubPackets.set("console.group('bar')", {
   }
 });
 
-stubPackets.set("console.groupEnd('bar')", {
+stubPackets.set(`console.groupEnd('bar')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2465,7 +2465,7 @@ stubPackets.set("console.groupEnd('bar')", {
   }
 });
 
-stubPackets.set("console.groupCollapsed('foo')", {
+stubPackets.set(`console.groupCollapsed('foo')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2490,7 +2490,7 @@ stubPackets.set("console.groupCollapsed('foo')", {
   }
 });
 
-stubPackets.set("console.groupEnd('foo')", {
+stubPackets.set(`console.groupEnd('foo')`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2513,7 +2513,7 @@ stubPackets.set("console.groupEnd('foo')", {
   }
 });
 
-stubPackets.set("console.group()", {
+stubPackets.set(`console.group()`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2536,7 +2536,7 @@ stubPackets.set("console.group()", {
   }
 });
 
-stubPackets.set("console.groupEnd()", {
+stubPackets.set(`console.groupEnd()`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2559,7 +2559,7 @@ stubPackets.set("console.groupEnd()", {
   }
 });
 
-stubPackets.set("console.log(%cfoobar)", {
+stubPackets.set(`console.log(%cfoobar)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2588,7 +2588,7 @@ stubPackets.set("console.log(%cfoobar)", {
   }
 });
 
-stubPackets.set("console.group(%cfoo%cbar)", {
+stubPackets.set(`console.group(%cfoo%cbar)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2617,7 +2617,7 @@ stubPackets.set("console.group(%cfoo%cbar)", {
   }
 });
 
-stubPackets.set("console.groupEnd(%cfoo%cbar)", {
+stubPackets.set(`console.groupEnd(%cfoo%cbar)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2640,7 +2640,7 @@ stubPackets.set("console.groupEnd(%cfoo%cbar)", {
   }
 });
 
-stubPackets.set("console.groupCollapsed(%cfoo%cbaz)", {
+stubPackets.set(`console.groupCollapsed(%cfoo%cbaz)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2669,7 +2669,7 @@ stubPackets.set("console.groupCollapsed(%cfoo%cbaz)", {
   }
 });
 
-stubPackets.set("console.groupEnd(%cfoo%cbaz)", {
+stubPackets.set(`console.groupEnd(%cfoo%cbaz)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2692,7 +2692,7 @@ stubPackets.set("console.groupEnd(%cfoo%cbaz)", {
   }
 });
 
-stubPackets.set("console.dir({C, M, Y, K})", {
+stubPackets.set(`console.dir({C, M, Y, K})`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2758,7 +2758,7 @@ stubPackets.set("console.dir({C, M, Y, K})", {
   }
 });
 
-stubPackets.set("console.count | default: 1", {
+stubPackets.set(`console.count | default: 1`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2786,7 +2786,7 @@ stubPackets.set("console.count | default: 1", {
   }
 });
 
-stubPackets.set("console.count | default: 2", {
+stubPackets.set(`console.count | default: 2`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2814,7 +2814,7 @@ stubPackets.set("console.count | default: 2", {
   }
 });
 
-stubPackets.set("console.count | test counter: 1", {
+stubPackets.set(`console.count | test counter: 1`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2842,7 +2842,7 @@ stubPackets.set("console.count | test counter: 1", {
   }
 });
 
-stubPackets.set("console.count | test counter: 2", {
+stubPackets.set(`console.count | test counter: 2`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2870,7 +2870,7 @@ stubPackets.set("console.count | test counter: 2", {
   }
 });
 
-stubPackets.set("console.count | default: 3", {
+stubPackets.set(`console.count | default: 3`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2898,7 +2898,7 @@ stubPackets.set("console.count | default: 3", {
   }
 });
 
-stubPackets.set("console.count | clear", {
+stubPackets.set(`console.count | clear`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2921,7 +2921,7 @@ stubPackets.set("console.count | clear", {
   }
 });
 
-stubPackets.set("console.count | default: 4", {
+stubPackets.set(`console.count | default: 4`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
@@ -2949,7 +2949,7 @@ stubPackets.set("console.count | default: 4", {
   }
 });
 
-stubPackets.set("console.count | test counter: 3", {
+stubPackets.set(`console.count | test counter: 3`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "consoleAPICall",
   "message": {
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
index e95f70e25e7e..cb34d23891f0 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/cssMessage.js
@@ -13,7 +13,7 @@ const { ConsoleMessage } =
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-stubPreparedMessages.set("Unknown property ‘such-unknown-property’.  Declaration dropped.", new ConsoleMessage({
+stubPreparedMessages.set(`Unknown property ‘such-unknown-property’.  Declaration dropped.`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "css",
@@ -36,7 +36,7 @@ stubPreparedMessages.set("Unknown property ‘such-unknown-property’.  Declara
   "indent": 0
 }));
 
-stubPreparedMessages.set("Error in parsing value for ‘padding-top’.  Declaration dropped.", new ConsoleMessage({
+stubPreparedMessages.set(`Error in parsing value for ‘padding-top’.  Declaration dropped.`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "css",
@@ -59,7 +59,7 @@ stubPreparedMessages.set("Error in parsing value for ‘padding-top’.  Declara
   "indent": 0
 }));
 
-stubPackets.set("Unknown property ‘such-unknown-property’.  Declaration dropped.", {
+stubPackets.set(`Unknown property ‘such-unknown-property’.  Declaration dropped.`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "pageError",
   "pageError": {
@@ -82,7 +82,7 @@ stubPackets.set("Unknown property ‘such-unknown-property’.  Declaration drop
   }
 });
 
-stubPackets.set("Error in parsing value for ‘padding-top’.  Declaration dropped.", {
+stubPackets.set(`Error in parsing value for ‘padding-top’.  Declaration dropped.`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "pageError",
   "pageError": {
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
index 6d951bf0d28e..87601930e20a 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/evaluationResult.js
@@ -13,7 +13,7 @@ const { ConsoleMessage } =
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-stubPreparedMessages.set("new Date(0)", new ConsoleMessage({
+stubPreparedMessages.set(`new Date(0)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -44,7 +44,7 @@ stubPreparedMessages.set("new Date(0)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("asdf()", new ConsoleMessage({
+stubPreparedMessages.set(`asdf()`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -72,7 +72,7 @@ stubPreparedMessages.set("asdf()", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("1 + @", new ConsoleMessage({
+stubPreparedMessages.set(`1 + @`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -100,7 +100,7 @@ stubPreparedMessages.set("1 + @", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("inspect({a: 1})", new ConsoleMessage({
+stubPreparedMessages.set(`inspect({a: 1})`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -143,7 +143,7 @@ stubPreparedMessages.set("inspect({a: 1})", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("cd(document)", new ConsoleMessage({
+stubPreparedMessages.set(`cd(document)`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -166,7 +166,7 @@ stubPreparedMessages.set("cd(document)", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPreparedMessages.set("longString message Error", new ConsoleMessage({
+stubPreparedMessages.set(`longString message Error`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -194,7 +194,53 @@ stubPreparedMessages.set("longString message Error", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPackets.set("new Date(0)", {
+stubPreparedMessages.set(`eval throw ""`, new ConsoleMessage({
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1517990289517,
+  "type": "result",
+  "helperType": null,
+  "level": "error",
+  "messageText": "Error",
+  "parameters": [
+    {
+      "type": "undefined"
+    }
+  ],
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Error\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": null,
+  "groupId": null,
+  "userProvidedStyles": null,
+  "notes": null,
+  "indent": 0
+}));
+
+stubPreparedMessages.set(`eval throw "tomato"`, new ConsoleMessage({
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1517990289520,
+  "type": "result",
+  "helperType": null,
+  "level": "error",
+  "messageText": "Error: tomato",
+  "parameters": [
+    {
+      "type": "undefined"
+    }
+  ],
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"Error: tomato\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": null,
+  "groupId": null,
+  "userProvidedStyles": null,
+  "notes": null,
+  "indent": 0
+}));
+
+stubPackets.set(`new Date(0)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "new Date(0)",
   "result": {
@@ -216,7 +262,7 @@ stubPackets.set("new Date(0)", {
   "notes": null
 });
 
-stubPackets.set("asdf()", {
+stubPackets.set(`asdf()`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "asdf()",
   "result": {
@@ -252,7 +298,7 @@ stubPackets.set("asdf()", {
   "notes": null
 });
 
-stubPackets.set("1 + @", {
+stubPackets.set(`1 + @`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "1 + @",
   "result": {
@@ -288,7 +334,7 @@ stubPackets.set("1 + @", {
   "notes": null
 });
 
-stubPackets.set("inspect({a: 1})", {
+stubPackets.set(`inspect({a: 1})`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "inspect({a: 1})",
   "result": {
@@ -328,7 +374,7 @@ stubPackets.set("inspect({a: 1})", {
   "notes": null
 });
 
-stubPackets.set("cd(document)", {
+stubPackets.set(`cd(document)`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "cd(document)",
   "result": {
@@ -344,7 +390,7 @@ stubPackets.set("cd(document)", {
   "notes": null
 });
 
-stubPackets.set("longString message Error", {
+stubPackets.set(`longString message Error`, {
   "from": "server1.conn0.child1/consoleActor2",
   "input": "throw new Error(\"Long error \".repeat(10000))",
   "result": {
@@ -385,6 +431,34 @@ stubPackets.set("longString message Error", {
   "notes": null
 });
 
+stubPackets.set(`eval throw ""`, {
+  "from": "server1.conn0.child1/consoleActor2",
+  "input": "throw \"\"",
+  "result": {
+    "type": "undefined"
+  },
+  "timestamp": 1517990289517,
+  "exception": "",
+  "exceptionMessage": "",
+  "frame": null,
+  "helperResult": null,
+  "notes": null
+});
+
+stubPackets.set(`eval throw "tomato"`, {
+  "from": "server1.conn0.child1/consoleActor2",
+  "input": "throw \"tomato\"",
+  "result": {
+    "type": "undefined"
+  },
+  "timestamp": 1517990289520,
+  "exception": "tomato",
+  "exceptionMessage": "tomato",
+  "frame": null,
+  "helperResult": null,
+  "notes": null
+});
+
 module.exports = {
   stubPreparedMessages,
   stubPackets,
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
index eaa95f7f0421..c144b9885f6d 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
@@ -247,7 +247,7 @@ stubPreparedMessages.set("XHR POST request update", new NetworkEventMessage({
   "method": "POST"
 }));
 
-stubPackets.set("GET request", {
+stubPackets.set(`GET request`, {
   "_type": "NetworkEvent",
   "timeStamp": 1487022056850,
   "node": null,
@@ -272,7 +272,7 @@ stubPackets.set("GET request", {
   "from": "server1.conn0.child1/consoleActor2"
 });
 
-stubPackets.set("GET request update", {
+stubPackets.set(`GET request update`, {
   "networkInfo": {
     "_type": "NetworkEvent",
     "actor": "server1.conn0.child1/netEvent30",
@@ -298,7 +298,7 @@ stubPackets.set("GET request update", {
   }
 });
 
-stubPackets.set("XHR GET request", {
+stubPackets.set(`XHR GET request`, {
   "_type": "NetworkEvent",
   "timeStamp": 1487022057746,
   "node": null,
@@ -323,7 +323,7 @@ stubPackets.set("XHR GET request", {
   "from": "server1.conn1.child1/consoleActor2"
 });
 
-stubPackets.set("XHR GET request update", {
+stubPackets.set(`XHR GET request update`, {
   "networkInfo": {
     "_type": "NetworkEvent",
     "actor": "server1.conn0.child1/netEvent31",
@@ -349,7 +349,7 @@ stubPackets.set("XHR GET request update", {
   }
 });
 
-stubPackets.set("XHR POST request", {
+stubPackets.set(`XHR POST request`, {
   "_type": "NetworkEvent",
   "timeStamp": 1487022058414,
   "node": null,
@@ -374,7 +374,7 @@ stubPackets.set("XHR POST request", {
   "from": "server1.conn2.child1/consoleActor2"
 });
 
-stubPackets.set("XHR POST request update", {
+stubPackets.set(`XHR POST request update`, {
   "networkInfo": {
     "_type": "NetworkEvent",
     "actor": "server1.conn0.child1/netEvent32",
diff --git a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
index 0ec851d82c65..3f91014f8858 100644
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/pageError.js
@@ -13,7 +13,7 @@ const { ConsoleMessage } =
 
 let stubPreparedMessages = new Map();
 let stubPackets = new Map();
-stubPreparedMessages.set("ReferenceError: asdf is not defined", new ConsoleMessage({
+stubPreparedMessages.set(`ReferenceError: asdf is not defined`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -68,7 +68,7 @@ stubPreparedMessages.set("ReferenceError: asdf is not defined", new ConsoleMessa
   "indent": 0
 }));
 
-stubPreparedMessages.set("SyntaxError: redeclaration of let a", new ConsoleMessage({
+stubPreparedMessages.set(`SyntaxError: redeclaration of let a`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -113,7 +113,7 @@ stubPreparedMessages.set("SyntaxError: redeclaration of let a", new ConsoleMessa
   "indent": 0
 }));
 
-stubPreparedMessages.set("TypeError longString message", new ConsoleMessage({
+stubPreparedMessages.set(`TypeError longString message`, new ConsoleMessage({
   "id": "1",
   "allowRepeating": true,
   "source": "javascript",
@@ -160,7 +160,45 @@ stubPreparedMessages.set("TypeError longString message", new ConsoleMessage({
   "indent": 0
 }));
 
-stubPackets.set("ReferenceError: asdf is not defined", {
+stubPreparedMessages.set(`throw ""`, new ConsoleMessage({
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1517942398629,
+  "type": "log",
+  "helperType": null,
+  "level": "error",
+  "messageText": "uncaught exception: ",
+  "parameters": null,
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"uncaught exception: \",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": null,
+  "groupId": null,
+  "userProvidedStyles": null,
+  "notes": null,
+  "indent": 0
+}));
+
+stubPreparedMessages.set(`throw "tomato"`, new ConsoleMessage({
+  "id": "1",
+  "allowRepeating": true,
+  "source": "javascript",
+  "timeStamp": 1517942398637,
+  "type": "log",
+  "helperType": null,
+  "level": "error",
+  "messageText": "uncaught exception: tomato",
+  "parameters": null,
+  "repeatId": "{\"frame\":null,\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"uncaught exception: tomato\",\"parameters\":null,\"source\":\"javascript\",\"type\":\"log\",\"userProvidedStyles\":null}",
+  "stacktrace": null,
+  "frame": null,
+  "groupId": null,
+  "userProvidedStyles": null,
+  "notes": null,
+  "indent": 0
+}));
+
+stubPackets.set(`ReferenceError: asdf is not defined`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "pageError",
   "pageError": {
@@ -215,7 +253,7 @@ stubPackets.set("ReferenceError: asdf is not defined", {
   }
 });
 
-stubPackets.set("SyntaxError: redeclaration of let a", {
+stubPackets.set(`SyntaxError: redeclaration of let a`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "pageError",
   "pageError": {
@@ -260,7 +298,7 @@ stubPackets.set("SyntaxError: redeclaration of let a", {
   }
 });
 
-stubPackets.set("TypeError longString message", {
+stubPackets.set(`TypeError longString message`, {
   "from": "server1.conn0.child1/consoleActor2",
   "type": "pageError",
   "pageError": {
@@ -307,6 +345,52 @@ stubPackets.set("TypeError longString message", {
   }
 });
 
+stubPackets.set(`throw ""`, {
+  "from": "server1.conn0.child1/consoleActor2",
+  "type": "pageError",
+  "pageError": {
+    "errorMessage": "uncaught exception: ",
+    "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
+    "sourceName": "",
+    "lineText": "",
+    "lineNumber": 0,
+    "columnNumber": 0,
+    "category": "content javascript",
+    "timeStamp": 1517942398629,
+    "warning": false,
+    "error": false,
+    "exception": false,
+    "strict": false,
+    "info": false,
+    "private": false,
+    "stacktrace": null,
+    "notes": null
+  }
+});
+
+stubPackets.set(`throw "tomato"`, {
+  "from": "server1.conn0.child1/consoleActor2",
+  "type": "pageError",
+  "pageError": {
+    "errorMessage": "uncaught exception: tomato",
+    "errorMessageName": "JSMSG_UNCAUGHT_EXCEPTION",
+    "sourceName": "",
+    "lineText": "",
+    "lineNumber": 0,
+    "columnNumber": 0,
+    "category": "content javascript",
+    "timeStamp": 1517942398637,
+    "warning": false,
+    "error": false,
+    "exception": false,
+    "strict": false,
+    "info": false,
+    "private": false,
+    "stacktrace": null,
+    "notes": null
+  }
+});
+
 module.exports = {
   stubPreparedMessages,
   stubPackets,