diff --git a/bin/ansible b/bin/ansible
index 494d54d2ed..0543aed79e 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -147,6 +147,8 @@ class Cli(object):
                 clock = clock - options.poll_interval
                 time.sleep(options.poll_interval)
                 poll_hosts = self.hosts_to_poll(poll_results)
+                if len(poll_hosts)==0:
+                    break
 
 ########################################################
 
diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index f40dfa3262..3ae546bdcc 100755
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -119,7 +119,7 @@ class Runner(object):
         euid = pwd.getpwuid(os.geteuid())[0]
         if self.transport == 'local' and self.remote_user != euid:
             raise Exception("User mismatch: expected %s, but is %s" % (self.remote_user, euid))
-        if type(self.module_args) != str and type(self.module_args) != dict:
+        if type(self.module_args) not in [str, unicode, dict]:
             raise Exception("module_args must be a string or dict: %s" % self.module_args)
 
         self._tmp_paths  = {}