diff --git a/pkg/action/action.go b/pkg/action/action.go
index 38ba638e4..d92c9e4d7 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -403,12 +403,12 @@ func (c *Configuration) Init(getter genericclioptions.RESTClientGetter, namespac
 			namespace,
 		)
 		if err != nil {
-			panic(fmt.Sprintf("Unable to instantiate SQL driver: %v", err))
+			return errors.Wrap(err, "Unable to instantiate SQL driver")
 		}
 		store = storage.Init(d)
 	default:
 		// Not sure what to do here.
-		panic("Unknown driver in HELM_DRIVER: " + helmDriver)
+		errors.Errorf("Unknown driver in HELM_DRIVER: %s", helmDriver)
 	}
 
 	c.RESTClientGetter = getter