diff --git a/frontend/src/app/main/worker.cljs b/frontend/src/app/main/worker.cljs
index 8bd60284f..40e07456b 100644
--- a/frontend/src/app/main/worker.cljs
+++ b/frontend/src/app/main/worker.cljs
@@ -7,19 +7,16 @@
 (ns app.main.worker
   (:require
    [app.config :as cfg]
+   [app.main.errors :as err]
    [app.util.worker :as uw]))
 
-(defn on-error
-  [error]
-  (js/console.error "Error on worker" (pr-str error)))
-
 (defonce instance (atom nil))
 
 (defn init!
   []
   (reset!
    instance
-   (uw/init cfg/worker-uri on-error)))
+   (uw/init cfg/worker-uri err/on-error)))
 
 (defn ask!
   [message]
diff --git a/frontend/src/app/worker.cljs b/frontend/src/app/worker.cljs
index 52bb72451..a37bce958 100644
--- a/frontend/src/app/worker.cljs
+++ b/frontend/src/app/worker.cljs
@@ -52,10 +52,13 @@
           (reply [result]
             (post {:payload result}))
 
-          (reply-error [err]
-            (.error js/console "error" (pr-str err))
-            (post {:error {:data (ex-data err)
-                           :message (ex-message err)}}))
+          (reply-error [cause]
+            (if (map? cause)
+              (post {:error cause})
+              (post {:error {:type :unexpected
+                             :code :unhandled-error-on-worker
+                             :hint (ex-message cause)
+                             :data (ex-data cause)}})))
 
           (reply-completed
             ([] (reply-completed nil))