diff --git a/lib/ansible/runner/action_plugins/group_by.py b/lib/ansible/runner/action_plugins/group_by.py
index 79bcea42c1..477f46fe84 100644
--- a/lib/ansible/runner/action_plugins/group_by.py
+++ b/lib/ansible/runner/action_plugins/group_by.py
@@ -58,8 +58,12 @@ class ActionModule(object):
             data = {}
             data.update(inject)
             data.update(inject['hostvars'][host])
-            if not check_conditional(self.runner.basedir, self.runner.conditional, data, fail_on_undefined=self.runner.error_on_undefined_vars):
-                continue
+            conds = self.runner.conditional
+            if type(conds) != list:
+                conds = [ conds ]
+            for cond in conds:
+                if not check_conditional(cond, self.runner.basedir, data, fail_on_undefined=self.runner.error_on_undefined_vars):
+                    continue
             group_name = template.template(self.runner.basedir, args['key'], data)
             group_name = group_name.replace(' ','-')
             if group_name not in groups:
diff --git a/lib/ansible/runner/lookup_plugins/flattened.py b/lib/ansible/runner/lookup_plugins/flattened.py
index e359f59172..831b2e9130 100644
--- a/lib/ansible/runner/lookup_plugins/flattened.py
+++ b/lib/ansible/runner/lookup_plugins/flattened.py
@@ -71,7 +71,7 @@ class LookupModule(object):
         terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
 
         if not isinstance(terms, list):
-            raise errors.AnsibleError("with_flat_list expects a list")
+            raise errors.AnsibleError("with_flattened expects a list")
 
         ret = self.flatten(terms, inject)
         return ret
diff --git a/library/system/setup b/library/system/setup
index 5b78aae02e..c304a3c848 100644
--- a/library/system/setup
+++ b/library/system/setup
@@ -633,10 +633,7 @@ class LinuxHardware(Hardware):
                         size_total = statvfs_result.f_bsize * statvfs_result.f_blocks
                         size_available = statvfs_result.f_bsize * (statvfs_result.f_bavail)
                     except OSError, e:
-                        if e.errno == errno.ENOENT:
-                            pass
-                        else:
-                            self.fail_json(msg=e.strerror)
+                        continue
 
                     self.facts['mounts'].append(
                         {'mount': fields[1],