diff --git a/pkg/helm/restclientgetter.go b/pkg/helm/restclientgetter.go
index 0b9e906c6..a57d2cdd4 100644
--- a/pkg/helm/restclientgetter.go
+++ b/pkg/helm/restclientgetter.go
@@ -49,7 +49,10 @@ func (c *restClientGetter) ToDiscoveryClient() (discovery.CachedDiscoveryInterfa
 		// write back the old burst value after it has been copied for discovery client creation
 		defer func() { c.config.Burst = oldBurst }()
 
-		discoveryClient, _ := discovery.NewDiscoveryClientForConfig(c.config)
+		discoveryClient, err := discovery.NewDiscoveryClientForConfig(c.config)
+		if err != nil {
+			return nil, err
+		}
 		c.discoveryClient = memory.NewMemCacheClient(discoveryClient)
 	}
 	return c.discoveryClient, nil
@@ -57,8 +60,10 @@ func (c *restClientGetter) ToDiscoveryClient() (discovery.CachedDiscoveryInterfa
 
 func (c *restClientGetter) ToRESTMapper() (meta.RESTMapper, error) {
 	if c.restMapper == nil {
-		// we know err is always nil
-		discoveryClient, _ := c.ToDiscoveryClient()
+		discoveryClient, err := c.ToDiscoveryClient()
+		if err != nil {
+			return nil, err
+		}
 
 		mapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
 		c.restMapper = restmapper.NewShortcutExpander(mapper, discoveryClient, nil)