diff --git a/src/eval.c b/src/eval.c
index caae4cb17e2..ecff5d40a10 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1817,7 +1817,7 @@ See also the function `condition-case'.  */
   (Lisp_Object error_symbol, Lisp_Object data)
 {
   /* If they call us with nonsensical arguments, produce "peculiar error".  */
-  if (NILP (error_symbol) && NILP (data))
+  if (NILP (error_symbol) && !CONSP (data))
     error_symbol = Qerror;
   signal_or_quit (error_symbol, data, false);
   eassume (false);