diff --git a/src/fns.c b/src/fns.c
index 279dba0fd88740399f96adec8940da7a91d1232b..8c895773115d10c6b347e0808db9e8444dae8eb1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3045,7 +3045,7 @@ SUBFEATURE can be used to check a specific subfeature of FEATURE.  */)
   CHECK_SYMBOL (feature);
   tem = Fmemq (feature, Vfeatures);
   if (!NILP (tem) && !NILP (subfeature))
-    tem = Fmemq (subfeature, Fget (feature, Qsubfeatures));
+    tem = Fmember (subfeature, Fget (feature, Qsubfeatures));
   return (NILP (tem)) ? Qnil : Qt;
 }
 
@@ -3058,6 +3058,7 @@ particular subfeatures supported in this version of FEATURE.  */)
 {
   register Lisp_Object tem;
   CHECK_SYMBOL (feature);
+  CHECK_LIST (subfeatures);
   if (!NILP (Vautoload_queue))
     Vautoload_queue = Fcons (Fcons (Vfeatures, Qnil), Vautoload_queue);
   tem = Fmemq (feature, Vfeatures);