diff --git a/cmd/troubleshoot/cli/version.go b/cmd/troubleshoot/cli/version.go
index b9396f6f..1bd68611 100644
--- a/cmd/troubleshoot/cli/version.go
+++ b/cmd/troubleshoot/cli/version.go
@@ -9,8 +9,8 @@ import (
 
 func writeVersionFile(path string) (string, error) {
 	version := troubleshootv1beta1.SupportBundleVersion{
-		ApiVersion:    "troubleshoot.replicated.com/v1beta1",
-		Kind:          "SupportBundle",
+		ApiVersion: "troubleshoot.replicated.com/v1beta1",
+		Kind:       "SupportBundle",
 	}
 	b, err := yaml.Marshal(version)
 	if err != nil {
diff --git a/pkg/analyze/download.go b/pkg/analyze/download.go
index 031c9935..86465b30 100644
--- a/pkg/analyze/download.go
+++ b/pkg/analyze/download.go
@@ -32,6 +32,11 @@ func DownloadAndAnalyze(ctx context.Context, bundleURL string) ([]*AnalyzeResult
 		return nil, err
 	}
 
+	_, err = os.Stat(filepath.Join(tmpDir, "version.yaml"))
+	if err != nil {
+		return nil, err
+	}
+
 	analyzers, err := getTroubleshootAnalyzers()
 	if err != nil {
 		return nil, err
diff --git a/pkg/apis/troubleshoot/v1beta1/version.go b/pkg/apis/troubleshoot/v1beta1/version.go
index 20eab80b..18d5ec43 100644
--- a/pkg/apis/troubleshoot/v1beta1/version.go
+++ b/pkg/apis/troubleshoot/v1beta1/version.go
@@ -1,6 +1,6 @@
 package v1beta1
 
 type SupportBundleVersion struct {
-	ApiVersion    string `json:"apiVersion" yaml:"apiVersion"`
-	Kind          string `json:"kind" yaml:"kind"`
+	ApiVersion string `json:"apiVersion" yaml:"apiVersion"`
+	Kind       string `json:"kind" yaml:"kind"`
 }