diff --git a/gnupg.py b/gnupg.py
index a8f36e2..d9488aa 100644
--- a/gnupg.py
+++ b/gnupg.py
@@ -912,27 +912,21 @@ def _sanitise(*args):
             logger.warn(error.message)
             logger.debug("Dropping option '%s'..." % _fix_unsafe(arg))
         else:
-            if allowed_flag is not None:
-                safe_values += (allowed_flag + " ")
-                if isinstance(value, str):
-                    value_list = []
-                    if value.find(' ') > 0:
-                        value_list = value.split(' ')
-                    else:
-                        logger.debug("_check_values(): got non-string for values")
-                    for value in value_list:
-                        safe_value = _fix_unsafe(value)
-                        if allowed_flag == '--encrypt' or '--encrypt-files' \
-                                or '--decrypt' or '--decrypt-file' \
-                                or '--import' or '--verify':
-                            ## xxx what other things should we check for?
-                            ## Place checks here:
-                            if _is_file(safe_value):
-                                safe_values += (safe_value + " ")
-                            else:
-                                logger.debug("Got non-filename for %s option: %s"
-                                    % (allowed_flag, safe_value))
-                        else:
+            safe_values += (allowed_flag + " ")
+            if isinstance(value, str):
+                value_list = []
+                if value.find(' ') > 0:
+                    value_list = value.split(' ')
+                else:
+                    logger.debug("_check_values(): got non-string for values")
+                for value in value_list:
+                    safe_value = _fix_unsafe(value)
+                    if allowed_flag == '--encrypt' or '--encrypt-files' \
+                            or '--decrypt' or '--decrypt-file' \
+                            or '--import' or '--verify':
+                        ## xxx what other things should we check for?
+                        ## Place checks here:
+                        if _is_file(safe_value):
                             safe_values += (safe_value + " ")
                             logger.debug("Got non-checked value: %s" % safe_value)
             else: