1 files changed, 4 insertions, 2 deletions

diff --git a/src/eval.c b/src/eval.c
index 2fedbf377cf..a9bad2491fa 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2841,9 +2841,11 @@ funcall_lambda (Lisp_Object fun, ptrdiff_t nargs,
     {
       if (EQ (XCAR (fun), Qclosure))
         {
-          fun = XCDR (fun);     /* Drop `closure'.  */
+          Lisp_Object cdr = XCDR (fun); /* Drop `closure'.  */
+          if (! CONSP (cdr))
+            xsignal1 (Qinvalid_function, fun);
+          fun = cdr;
           lexenv = XCAR (fun);
-          CHECK_LIST_CONS (fun, fun);
         }
       else
         lexenv = Qnil;