diff --git a/armada/handlers/armada.py b/armada/handlers/armada.py
index 27b97e0c..400b5f9d 100644
--- a/armada/handlers/armada.py
+++ b/armada/handlers/armada.py
@@ -87,6 +87,12 @@ class Armada(object):
         '''
 
         # extract known charts on tiller right now
+        if not self.skip_pre_flight:
+            LOG.info("Performing Pre-Flight Checks")
+            self.pre_flight_checks()
+        else:
+            LOG.info("Skipping Pre-Flight Checks")
+
         known_releases = self.tiller.list_charts()
         prefix = self.config.get('armada').get('release_prefix')
 
@@ -94,12 +100,6 @@ class Armada(object):
             LOG.debug("Release %s, Version %s found on tiller", release[0],
                       release[1])
 
-        if not self.skip_pre_flight:
-            LOG.info("Performing Checking Pre Flight Tasks")
-            self.pre_flight_checks()
-        else:
-            LOG.info("Skipping Pre flight Checks")
-
         for entry in self.config['armada']['charts']:
 
             chart = dotify(entry['chart'])