diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 952719623..ead4a2c49 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -67,11 +67,13 @@ func main() {
 	actionConfig := new(action.Configuration)
 	cmd, err := newRootCmd(actionConfig, os.Stdout, os.Args[1:])
 	if err != nil {
-		log.Fatal(err)
+		debug("%+v", err)
+		os.Exit(1)
 	}
 
 	if err := actionConfig.Init(settings.RESTClientGetter(), settings.Namespace(), os.Getenv("HELM_DRIVER"), debug); err != nil {
-		log.Fatal(err)
+		debug("%+v", err)
+		os.Exit(1)
 	}
 
 	if err := cmd.Execute(); err != nil {