1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/map-ynp.el b/lisp/map-ynp.el
index 28491b5626b..a0badd5ed3a 100644
--- a/lisp/map-ynp.el
+++ b/lisp/map-ynp.el
@@ -89,7 +89,7 @@ Returns the number of actions taken."
                             query-replace-map)))
          (actions 0)
          prompt char elt tail def delayed-switch-frame
-         (next (if (or (symbolp list)
+         (next (if (or (and list (symbolp list))
                        (subrp list)
                        (byte-code-function-p list)
                        (and (consp list)