diff --git a/frontend/deps.edn b/frontend/deps.edn
index 81199815b..508864cde 100644
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -14,7 +14,7 @@
   funcool/beicon {:mvn/version "2020.12.20-1"}
   funcool/cuerdas {:mvn/version "2020.03.26-3"}
   funcool/okulary {:mvn/version "2020.04.14-0"}
-  funcool/potok {:mvn/version "3.0.0"}
+  funcool/potok {:mvn/version "3.1.0"}
   funcool/promesa {:mvn/version "6.0.0"}
   funcool/rumext {:mvn/version "2020.11.27-0"}
 
diff --git a/frontend/src/app/main/ui.cljs b/frontend/src/app/main/ui.cljs
index 62e2d44b0..8da427f80 100644
--- a/frontend/src/app/main/ui.cljs
+++ b/frontend/src/app/main/ui.cljs
@@ -266,19 +266,21 @@
 
 (defmethod ptk/handle-error :default
   [error]
-  (js/console.log error)
   (if (instance? ExceptionInfo error)
     (ptk/handle-error (ex-data error))
     (do
-      (js/console.group "Generic Error:")
+      (js/console.group "Generic Error")
+      (js/console.log "hint:" (or (ex-message error)
+                                  (:hint error)
+                                  (:message error)))
       (ex/ignoring
-       (js/console.error (pr-str error))
-       (js/console.error (.-stack error)))
+       (js/console.error "repr: " (pr-str error))
+       (js/console.error "stack:" (.-stack error)))
       (js/console.groupEnd "Generic error")
       (ts/schedule (st/emitf (dm/show
                               {:content "Something wrong has happened."
                                :type :error
-                               :timeout 5000}))))))
+                               :timeout 3000}))))))
 
 (defmethod ptk/handle-error :server-error
   [{:keys [status] :as error}]
diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs
index 026da3504..d1985ee7b 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/context_menu.cljs
@@ -55,8 +55,8 @@
 
         do-duplicate #(st/emit! dw/duplicate-selected)
         do-delete #(st/emit! dw/delete-selected)
-        do-copy #(st/emit! dw/copy-selected)
-        do-cut #(st/emit! dw/copy-selected dw/delete-selected)
+        do-copy #(st/emit! (dw/copy-selected))
+        do-cut #(st/emit! (dw/copy-selected) dw/delete-selected)
         do-paste #(st/emit! dw/paste)
         do-bring-forward #(st/emit! (dw/vertical-order-selected :up))
         do-bring-to-front #(st/emit! (dw/vertical-order-selected :top))