diff --git a/cmd/helm/testdata/output/upgrade-with-missing-dependencies.txt b/cmd/helm/testdata/output/upgrade-with-missing-dependencies.txt
index adf2ae899..b2c154a80 100644
--- a/cmd/helm/testdata/output/upgrade-with-missing-dependencies.txt
+++ b/cmd/helm/testdata/output/upgrade-with-missing-dependencies.txt
@@ -1 +1 @@
-Error: An error occurred while checking for chart dependencies. You may need to run `helm dependency build` to fetch missing dependencies: found in Chart.yaml, but missing in charts/ directory: reqsubchart2
+Error: an error occurred while checking for chart dependencies. You may need to run `helm dependency build` to fetch missing dependencies: found in Chart.yaml, but missing in charts/ directory: reqsubchart2
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index db8486340..1918acd74 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -186,7 +186,7 @@ func TestUpgradeRelease_Atomic(t *testing.T) {
 		_, err := upAction.Run(rel.Name, buildChart(), vals)
 		req.Error(err)
 		is.Contains(err.Error(), "update fail")
-		is.Contains(err.Error(), "an error occurred while rolling back the release")
+		is.Contains(err.Error(), "rollback failed")
 	})
 }
 
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index c261c0a5e..f9e235db9 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -132,7 +132,7 @@ func includeFun(t *template.Template, includedNames map[string]int) func(string,
 		var buf strings.Builder
 		if v, ok := includedNames[name]; ok {
 			if v > recursionMaxNums {
-				return "", fmt.Errorf("rendering template has a nested reference name %s: unable to execute template", name)
+				return "", fmt.Errorf("rendering template has a nested reference name: %s: unable to execute template", name)
 			}
 			includedNames[name]++
 		} else {
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index ac2787804..b3985d84c 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -161,5 +161,9 @@ func SelectorsForObject(object runtime.Object) (selector labels.Selector, err er
 		return nil, fmt.Errorf("selector for %T not implemented", object)
 	}
 
-	return selector, fmt.Errorf("invalid label selector: %w", err)
+	if err != nil {
+		return selector, fmt.Errorf("invalid label selector: %w", err)
+	}
+
+	return selector, nil
 }
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 7329b7eb0..de0dbf8dc 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -227,7 +227,10 @@ func validateAllowedExtension(fileName string) error {
 }
 
 func validateYamlContent(err error) error {
-	return fmt.Errorf("unable to parse YAML: %w", err)
+	if err != nil {
+		return fmt.Errorf("unable to parse YAML: %w", err)
+	}
+	return nil
 }
 
 // validateMetadataName uses the correct validation function for the object
diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go
index 33de412bf..861120a5f 100644
--- a/pkg/storage/driver/secrets.go
+++ b/pkg/storage/driver/secrets.go
@@ -72,8 +72,11 @@ func (secrets *Secrets) Get(key string) (*rspb.Release, error) {
 	}
 	// found the secret, decode the base64 data string
 	r, err := decodeRelease(string(obj.Data["release"]))
+	if err != nil {
+		return r, fmt.Errorf("get: failed to decode data %q: %w", key, err)
+	}
 	r.Labels = filterSystemLabels(obj.ObjectMeta.Labels)
-	return r, fmt.Errorf("get: failed to decode data %q: %w", key, err)
+	return r, nil
 }
 
 // List fetches all releases and returns the list releases such
@@ -186,7 +189,10 @@ func (secrets *Secrets) Update(key string, rls *rspb.Release) error {
 	}
 	// push the secret object out into the kubiverse
 	_, err = secrets.impl.Update(context.Background(), obj, metav1.UpdateOptions{})
-	return fmt.Errorf("update: failed to update: %w", err)
+	if err != nil {
+		return fmt.Errorf("update: failed to update: %w", err)
+	}
+	return nil
 }
 
 // Delete deletes the Secret holding the release named by key.