1 files changed, 9 insertions, 4 deletions

diff --git a/src/eval.c b/src/eval.c
index 56842ac99f3..da63f9833a1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1328,10 +1328,15 @@ See also the function `condition-case'.")
   /* Remember from where signal was called.  Skip over the frame for
      `signal' itself.  If a frame for `error' follows, skip that,
      too.  */
-  bp = backtrace_list->next;
-  if (bp && bp->function && EQ (*bp->function, Qerror))
-    bp = bp->next;
-  Vsignaling_function = bp && bp->function ? *bp->function : Qnil;
+  Vsignaling_function = Qnil;
+  if (backtrace_list)
+    {
+      bp = backtrace_list->next;
+      if (bp && bp->function && EQ (*bp->function, Qerror))
+        bp = bp->next;
+      if (bp && bp->function)
+        Vsignaling_function = *bp->function;
+    }
 
   for (; handlerlist; handlerlist = handlerlist->next)
     {