   (message "  M-x doom/restart")
   (message "  M-x doom/reload"))
 
-(defun doom--reload-files (&rest files)
-  (if noninteractive
-      (add-hook 'doom-cli-post-success-execute-hook #'doom--warn-refresh-session-h)
-    (dolist (file files)
-      (load-file (byte-compile-dest-file file)))))
-
 (defun doom--byte-compile-file (file)
   (let ((byte-compile-warnings (if doom-debug-mode byte-compile-warnings))
         (byte-compile-dynamic t)
         (byte-compile-dynamic-docstrings t))
-    (condition-case e
+    (condition-case-unless-debug e
         (when (byte-compile-file file)
-          ;; Give autoloads file a chance to report error
-          (load (if doom-debug-mode
-                    file
-                  (byte-compile-dest-file file))
-                nil t))
+          (if noninteractive
+              (add-hook 'doom-cli-post-success-execute-hook #'doom--warn-refresh-session-h)
+            ;; Give autoloads file a chance to report error
+            (load file 'noerror 'nomessage)))
       ((debug error)
        (let ((backup-file (concat file ".bk")))
          (print! (warn "Copied backup to %s") (relpath backup-file))

       ;; few marginal performance boosts)
       (print! (start "Byte-compiling %s...") (relpath doom-package-autoload-file))
       (when (doom--byte-compile-file doom-package-autoload-file)
         (print! (success "Finished compiling %s") (relpath doom-package-autoload-file)))
       (doom--reload-files doom-package-autoload-file)))
   t))

                (print! (debug "Ignoring %s") (relpath file)))

               ((let ((generated-autoload-load-name (file-name-sans-extension file)))
                  (autoload-generate-file-autoloads file (current-buffer)))
                (print! (debug "Nothing in %s") (relpath file)))

