diff --git a/.gitignore b/.gitignore
index 20f225bdaa..d8615236f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ htmlcov/
 /.pydevproject
 /.idea
 /.ropeproject
+.ropeproject
 /*.iml
 *.sublime-project
 *.sublime-workspace
diff --git a/salt/minion.py b/salt/minion.py
index 28bb434ea3..be595ae159 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -469,6 +469,10 @@ class MultiMinion(MinionBase):
                 minions.append(Minion(s_opts, 5, False))
             except SaltClientError as exc:
                 log.error('Error while bringing up minion for multi-master. Is master at {0} responding?'.format(master))
+        if len(minions) == 0:
+            err = 'Error while bringing up minion for multi-master. All configured masters [{0}] are not responding!!!'.format(", ".join(map(str, set(self.opts['master']))))
+            log.error(err)
+            raise SaltClientError(err)
         return minions
 
     def minions(self):