diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 21d3fd2c8..4c7021872 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -437,8 +437,12 @@ func cleanupExecError(filename string, err error) error {
 		}
 		finalErrorString = finalErrorString + fileLocation.String()
 	}
+	if strings.TrimSpace(finalErrorString) == "" {
+		// Fallback to original error message if nothing was extracted
+		return fmt.Errorf("%s", err.Error())
+	}
 
-	return fmt.Errorf("NEW ERROR FORMAT: \n%s\n\n\nORIGINAL ERROR:\n%s", finalErrorString, err.Error())
+	return fmt.Errorf("%s", finalErrorString)
 }
 
 func sortTemplates(tpls map[string]renderable) []string {