diff --git a/lib/hyperscript/runtime.sx b/lib/hyperscript/runtime.sx
index 125a2e4b..86d3cb91 100644
--- a/lib/hyperscript/runtime.sx
+++ b/lib/hyperscript/runtime.sx
@@ -25,10 +25,12 @@
   (fn
     (target event-name handler)
     (let
-      ((unlisten (dom-listen target event-name handler))
-        (prev (or (dom-get-data target "hs-unlisteners") (list))))
-      (dom-set-data target "hs-unlisteners" (append prev (list unlisten)))
-      unlisten)))
+      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (handler event)))))
+      (let
+        ((unlisten (dom-listen target event-name wrapped))
+          (prev (or (dom-get-data target "hs-unlisteners") (list))))
+        (dom-set-data target "hs-unlisteners" (append prev (list unlisten)))
+        unlisten))))
 
 ;; Run an initializer function immediately.
 ;; (hs-init thunk) — called at element boot time
diff --git a/shared/static/wasm/sx/hs-runtime.sx b/shared/static/wasm/sx/hs-runtime.sx
index 125a2e4b..86d3cb91 100644
--- a/shared/static/wasm/sx/hs-runtime.sx
+++ b/shared/static/wasm/sx/hs-runtime.sx
@@ -25,10 +25,12 @@
   (fn
     (target event-name handler)
     (let
-      ((unlisten (dom-listen target event-name handler))
-        (prev (or (dom-get-data target "hs-unlisteners") (list))))
-      (dom-set-data target "hs-unlisteners" (append prev (list unlisten)))
-      unlisten)))
+      ((wrapped (fn (event) (guard (e ((and (not (= event-name "exception")) (not (= event-name "error"))) (dom-dispatch target "exception" {:error e})) (true (raise e))) (handler event)))))
+      (let
+        ((unlisten (dom-listen target event-name wrapped))
+          (prev (or (dom-get-data target "hs-unlisteners") (list))))
+        (dom-set-data target "hs-unlisteners" (append prev (list unlisten)))
+        unlisten))))
 
 ;; Run an initializer function immediately.
 ;; (hs-init thunk) — called at element boot time