diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js
index c51269ee42..05fd2f5f45 100644
--- a/tools/deploy-galaxy.js
+++ b/tools/deploy-galaxy.js
@@ -35,6 +35,11 @@ var getGalaxy = function (context) {
     }
 
     _galaxy = Meteor.connect(context.galaxy.url);
+    Meteor.setTimeout(function () {
+      if (_galaxy.status().status !== "connected") {
+        exitWithError("Could not connect to galaxy " + context.galaxy + ": " + _galaxy.status().status);
+      }
+    }, 10*1000);
   }
 
   return _galaxy;