diff --git a/cmd/cluster_instance_orchestration.go b/cmd/cluster_instance_orchestration.go
index 448dfc6c..cb669ac0 100644
--- a/cmd/cluster_instance_orchestration.go
+++ b/cmd/cluster_instance_orchestration.go
@@ -36,12 +36,6 @@ func orchestrateInstances(systemStatus *SystemStatus, kubeconfig *KubeConfig) {
 		return
 	}
 
-	if err != nil {
-		log.WithError(err).Fatalln("cannot get current containers")
-		orchestrationRoundErrors += 1
-		return
-	}
-
 	// Manage an instance for each cluster
 	for _, cluster := range discoveredClusters {
 		log.WithFields(log.Fields{"cluster": cluster.Name, "endpoint": cluster.APIEndpoint}).Debugln("processing new cluster")
diff --git a/cmd/provider_gke.go b/cmd/provider_gke.go
index 6a2ba386..593922e7 100644
--- a/cmd/provider_gke.go
+++ b/cmd/provider_gke.go
@@ -53,7 +53,11 @@ func updateGKEClusters() {
 		} else {
 			log.WithField("cluster", cluster.Name).Debugln("added/updated GKE cluster credentials")
 		}
-		cmd.Wait()
+
+		err = cmd.Wait()
+		if err != nil {
+			log.WithField("cluster", cluster.Name).WithError(err).Errorln("failed to execute command:", string(cmd.String()))
+		}
 	}
 }