1 files changed, 2 insertions, 2 deletions

diff --git a/src/coding.c b/src/coding.c
index 7884879478c..33bf0084674 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3396,9 +3396,9 @@ which is a list of all the arguments given to `find-coding-system'.")
                && STRINGP (XCONS (elt)->car)
                && fast_string_match (XCONS (elt)->car, target) >= 0)
               || (INTEGERP (target) && EQ (target, XCONS (elt)->car))))
-        return (CONSP (val = XCONS (elt)->cdr)
+        return (val = XCONS (elt)->cdr, CONSP (val)
                 ? val
-                : ((SYMBOLP (val) && Fboundp (val)
+                : ((SYMBOLP (val) && !NILP (Fboundp (val))
                     ? call2 (val, Flist (nargs, args))
                     : Qnil)));
     }