diff --git a/plugins/module_utils/crypto/support.py b/plugins/module_utils/crypto/support.py
index 61d8d76d..f5122c79 100644
--- a/plugins/module_utils/crypto/support.py
+++ b/plugins/module_utils/crypto/support.py
@@ -246,8 +246,8 @@ def parse_name_field(input_dict, name_field_name=None):
             for entry in value:
                 if not isinstance(entry, six.string_types):
                     if name_field_name:
-                        raise ValueError('Values for {key} in {name} must be strings'.format(key=key, name=name_field_name))
-                    raise ValueError('Values for {key} must be strings'.format(key=key))
+                        raise TypeError('Values for {key} in {name} must be strings'.format(key=key, name=name_field_name))
+                    raise TypeError(Values for {key} must be strings'.format(key=key))
                 result.append((key, entry))
         elif isinstance(value, six.string_types):
             result.append((key, value))
diff --git a/plugins/modules/x509_crl.py b/plugins/modules/x509_crl.py
index a3af289e..d92075ed 100644
--- a/plugins/modules/x509_crl.py
+++ b/plugins/modules/x509_crl.py
@@ -484,7 +484,7 @@ class CRL(OpenSSLObject):
                 self.issuer_ordered = False
                 self.issuer = parse_name_field(module.params['issuer'], 'issuer')
                 self.issuer = [(entry[0], entry[1]) for entry in self.issuer if entry[1]]
-        except ValueError as exc:
+        except (TypeError, ValueError) as exc:
             module.fail_json(msg=to_native(exc))
 
         self.last_update = get_relative_time_option(module.params['last_update'], 'last_update')