diff --git a/dynamic/main.go b/dynamic/main.go
index 58531e553..2fa6ef543 100644
--- a/dynamic/main.go
+++ b/dynamic/main.go
@@ -168,9 +168,9 @@ func initialSetup() (info.Provider, pfbridge.ProviderMetadata, func() error) {
 					if err != nil {
 						return plugin.ParameterizeResponse{}, err
 					}
-					versionWithPrefix := "v" + info.Version
+					versionTag := "v" + info.Version
 					cmd := exec.Command(
-						"git", "clone", "--depth", "1", "-b", versionWithPrefix, info.Repository, tmpDir,
+						"git", "clone", "--depth", "1", "-b", versionTag, info.Repository, tmpDir,
 					)
 					err = cmd.Run()
 					if err != nil {
diff --git a/pkg/tfgen/generate.go b/pkg/tfgen/generate.go
index 2758b50c1..23468b152 100644
--- a/pkg/tfgen/generate.go
+++ b/pkg/tfgen/generate.go
@@ -1423,6 +1423,7 @@ func (g *Generator) gatherResource(rawname string,
 			g.warn(msg)
 		}
 	}
+
 	return res, nil
 }
 
diff --git a/pkg/tfgen/main.go b/pkg/tfgen/main.go
index deafe15a1..4aa68e713 100644
--- a/pkg/tfgen/main.go
+++ b/pkg/tfgen/main.go
@@ -50,9 +50,6 @@ func Main(pkg string, version string, prov tfbridge.ProviderInfo) {
 
 		// Let's generate some code!
 		_, err = g.Generate()
-		if err != nil {
-			return err
-		}
 		return err
 	})
 }