diff --git a/src/doc.c b/src/doc.c
index 3286c12675a..e81740bfc1c 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -336,6 +336,8 @@ string is passed through `substitute-command-keys'.  */)
     }
 
   fun = Findirect_function (function, Qnil);
+  if (NILP (fun))
+    xsignal1 (Qvoid_function, function);
   if (CONSP (fun) && EQ (XCAR (fun), Qmacro))
     fun = XCDR (fun);
   if (SUBRP (fun))