diff --git a/core/core-modules.el b/core/core-modules.el
index e58a48db1..a5f09fc3a 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -43,13 +43,14 @@ non-nil."
       (condition-case e
           (load (expand-file-name "init" doom-private-dir)
                 'noerror 'nomessage)
-        (error (signal 'doom-private-error (list 'init e)))))))
+        ((debug error)
+         (signal 'doom-private-error (list 'init e)))))))
 
 (defun doom-initialize-autoloads (file)
   "Tries to load FILE (an autoloads file). Return t on success, nil otherwise."
   (condition-case e
       (load (file-name-sans-extension file) 'noerror 'nomessage)
-    ('error
+    ((debug error)
      (if noninteractive
          (message "Autoload file warning: %s -> %s" (car e) (error-message-string e))
        (signal 'doom-autoload-error e)))))
@@ -292,7 +293,8 @@ to least)."
              (condition-case e
                  (load ,(expand-file-name "config" doom-private-dir)
                        t (not doom-debug-mode))
-               (error (signal 'doom-private-error (list 'config e))))))))))
+               ((debug error)
+                (signal 'doom-private-error (list 'config e))))))))))
 
 (defvar doom-disabled-packages)
 (defmacro def-package! (name &rest plist)
diff --git a/core/core-packages.el b/core/core-packages.el
index 780cad089..ba858c613 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -217,7 +217,7 @@ elsewhere."
            ,(if pkg-pin `(map-put package-pinned-packages ',name ,pkg-pin))
            (map-put doom-packages ',name ',plist)
            (not (memq ',name doom-disabled-packages))))
-    (error
+    ((debug error)
      (signal 'doom-private-error
              (list (list 'packages name) e)))))
 
diff --git a/core/core.el b/core/core.el
index 10ed1d972..e485a31d5 100644
--- a/core/core.el
+++ b/core/core.el
@@ -247,7 +247,8 @@ easier to tell where the came from.
 Meant to be used with `run-hook-wrapped'."
   (condition-case e
       (funcall hook)
-    (error (signal 'doom-hook-error (list hook e))))
+    ((debug error)
+     (signal 'doom-hook-error (list hook e))))
   ;; return nil so `run-hook-wrapped' won't short circuit
   nil)
 
diff --git a/modules/emacs/eshell/autoload/evil.el b/modules/emacs/eshell/autoload/evil.el
index 608b36354..f6bc1f3d9 100644
--- a/modules/emacs/eshell/autoload/evil.el
+++ b/modules/emacs/eshell/autoload/evil.el
@@ -21,11 +21,11 @@ already there)."
 
 ;;;###autoload (autoload '+eshell:run "emacs/eshell/autoload/evil" nil t)
 (evil-define-command +eshell:run (command bang)
-  ;; TODO Add COMMAND support
+  "TODO"
   (interactive "<fsh><!>")
   (if bang
-      (+eshell/open command)
-    (+eshell/open-popup command)))
+      (+eshell/open nil command)
+    (+eshell/open-popup nil command)))
 
 ;;;###autoload (autoload '+eshell/evil-change "emacs/eshell/autoload/evil" nil t)
 (evil-define-operator +eshell/evil-change (beg end type register yank-handler delete-func)