diff --git a/core/core-defuns.el b/core/core-defuns.el
index 67a17afd6..327d20316 100644
--- a/core/core-defuns.el
+++ b/core/core-defuns.el
@@ -96,7 +96,7 @@ Examples:
                (let ((hook-name (intern (format "narf--init-mode-%s" mode))))
                  `(progn
                     (defun ,hook-name ()
-                      (when (and ,(if match `(string-match-p ,match buffer-file-name) t)
+                      (when (and ,(if match `(if buffer-file-name (string-match-p ,match buffer-file-name)) t)
                                  (or ,(not files)
                                      (and (boundp ',mode)
                                           (not ,mode)