jsdom · domenic · May 22, 2021 · May 7, 2021 · May 7, 2021 · May 8, 2021
diff --git a/lib/jsdom/living/helpers/runtime-script-errors.js b/lib/jsdom/living/helpers/runtime-script-errors.js
@@ -55,7 +55,7 @@ module.exports = function reportException(window, error, filenameHint) {
 
   const windowImpl = idlUtils.implForWrapper(window);
 
-  const handled = reportAnError(lineNumber, columnNumber, windowImpl, error, error.message, fileName);
+  const handled = reportAnError(lineNumber, columnNumber, windowImpl, error, error && error.message, fileName);
 
   if (!handled) {
     const errorString = shouldBeDisplayedAsError(error) ? `[${error.name}: ${error.message}]` : util.inspect(error);
@@ -68,5 +68,5 @@ module.exports = function reportException(window, error, filenameHint) {
 };
 
 function shouldBeDisplayedAsError(x) {
-  return x.name && x.message !== undefined && x.stack;
+  return x && x.name && x.message !== undefined && x.stack;
 }
diff --git a/test/api/jsdom-errors.js b/test/api/jsdom-errors.js
@@ -33,4 +33,21 @@ describe("API: virtual console jsdomErrors", () => {
 
     assert.isEmpty(errors);
   });
+
+  it("should emit unhandled null value thrown in inline event handlers", t => {
+    const virtualConsole = new VirtualConsole();
+    virtualConsole.on("jsdomError", error => {
+      assert.ok(error instanceof Error);
+      assert.equal(error.message, "Uncaught null");
+      assert.isNull(error.detail);
+      t.done();
+    });
+
+    const html = `<body onclick="throw null"></body>`;
+    const doc = (new JSDOM(html, { virtualConsole, runScripts: "dangerously" })).window.document;
+
+    doc.body.click();
+  }, {
+    async: true
+  });
 });
diff --git a/test/web-platform-tests/to-upstream/dom/events/Event-dispatch-throwing.html b/test/web-platform-tests/to-upstream/dom/events/Event-dispatch-throwing.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>Throwing in event listeners</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+  "use strict";
+
+  setup({ allow_uncaught_exception: true });
+
+  test(() => {
+    let errorEvents = 0;
+    document.defaultView.addEventListener("error", event => {
+      assert_equals(event.message, null);
+      assert_equals(event.error, null);
+      ++errorEvents;
+    });
+
+    const element = document.createElement("div");
+
+    element.addEventListener("click", () => {
+      throw null; // eslint-disable-line no-throw-literal
+    });
+
+    element.dispatchEvent(new Event("click"));
+
+    assert_equals(errorEvents, 1);
+  }, "Throwing null in event listener");
+</script>