diff --git a/cli/app/deploy.go b/cli/app/deploy.go
index fa670577..7378a4a4 100644
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@@ -196,6 +196,8 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			deployedVersion = deployMeta.Version
 		}
 
+		// Gather secrets
+
 		secStats, err := secret.PollSecretsStatus(cl, app)
 		if err != nil {
 			log.Fatal(err)
@@ -211,6 +213,8 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			secretInfo = append(secretInfo, fmt.Sprintf("%s: %s", secStat.LocalName, secStat.Version))
 		}
 
+		// Gather configs
+
 		// Get current configs from existing deployment
 		currentConfigNames, err := client.GetConfigNamesForStack(cl, context.Background(), app.StackName())
 		if err != nil {
@@ -237,7 +241,9 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			versionKey := strings.ToUpper(configName) + "_VERSION"
 			newVersion, exists := abraShEnv[versionKey]
 			if !exists {
-				log.Fatalf("No version found for config %s", configName)
+				log.Warnf("No version found for config %s", configName)
+				configInfo = append(configInfo, fmt.Sprintf("%s: ? (missing)", configName))
+				continue
 			}
 			
 			if currentVersion, exists := currentConfigs[configName]; exists {
@@ -268,6 +274,7 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		); err != nil {
 			log.Fatal(err)
 		}
+		// FIXME: just for debugging
 		return
 
 		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)