diff --git a/src/tui-utils.lisp b/src/tui-utils.lisp
index 52c3d26..5676682 100644
--- a/src/tui-utils.lisp
+++ b/src/tui-utils.lisp
@@ -503,20 +503,22 @@ latter has a length equals to `total-size'"))
 
 (defmacro with-notify-errors (&body body)
   #+(or debug-mode debug-tui-errors) `(progn ,@body)
-  #-debug-mode `(handler-case
-                    (progn
-                      ,@body)
-                  (error (e)
-                    (ui:notify (format nil (_ "Error: ~a") e)
-                               :life     (* (swconf:config-notification-life) 5)
-                               :as-error t)
-                    nil)))
+  #-(or debug-mode debug-tui-errors)
+  `(handler-case
+       (progn
+         ,@body)
+     (error (e)
+       (ui:notify (format nil (_ "Error: ~a") e)
+                  :life     (* (swconf:config-notification-life) 5)
+                  :as-error t)
+       nil)))
 
 (defmacro with-print-error-message (&body body)
-  #+debug-mode `(progn ,@body)
-  #-debug-mode `(handler-case
-                    (progn
-                      ,@body)
-                  (error (e)
-                    (ui:error-message (format nil (_ "Error: ~a") e))
-                    nil)))
+  #+(or debug-mode debug-tui-errors) `(progn ,@body)
+  #-(or debug-mode debug-tui-errors)
+  `(handler-case
+       (progn
+         ,@body)
+     (error (e)
+       (ui:error-message (format nil (_ "Error: ~a") e))
+       nil)))