1 files changed, 4 insertions, 2 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 15ed613efd0..007b095a9a8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -753,7 +753,8 @@ with `delete-process'.")
       }
 
     /* Then run the hooks.  */
-    call1 (Vrun_hooks, Qkill_buffer_hook);
+    if (!NILP (Vrun_hooks))
+      call1 (Vrun_hooks, Qkill_buffer_hook);
     unbind_to (count, Qnil);
   }
 
@@ -1211,7 +1212,8 @@ a non-nil `permanent-local' property are not eliminated by this function.")
   register Lisp_Object alist, sym, tem;
   Lisp_Object oalist;
 
-  call1 (Vrun_hooks, intern ("change-major-mode-hook"));
+  if (!NILP (Vrun_hooks))
+    call1 (Vrun_hooks, intern ("change-major-mode-hook"));
   oalist = current_buffer->local_var_alist;
 
   /* Make sure no local variables remain set up with this buffer