diff --git a/UPDATE_KUBERNETES.md b/UPDATE_KUBERNETES.md
index 38eb1df2a7..d5805d36c4 100644
--- a/UPDATE_KUBERNETES.md
+++ b/UPDATE_KUBERNETES.md
@@ -88,3 +88,6 @@ git commit -m "Manual changes to update Kubernetes to foo"
 
 As a final part of updating kubernetes, a new version of localkube should be uploaded to GCS so that users can select this version of kubernetes/localkube in later minikube/localkube builds.  For instructions on how to do this, see [LOCALKUBE_RELEASING.md](https://github.com/kubernetes/minikube/blob/master/LOCALKUBE_RELEASING.md)
 
+#### Note on bugfix from Kubernetes
+
+In case that specific bugfix patches have been applied to the k8s vendor tree, the patches could be at some point overwritten by next Kubernetes updates. So contributors should check if the vendor tree still contains the bugfixes even after having updated the vendor tree.
diff --git a/vendor/k8s.io/kubernetes/pkg/client/restclient/url_utils.go b/vendor/k8s.io/kubernetes/pkg/client/restclient/url_utils.go
index 81f16d63ea..7bf17ac775 100644
--- a/vendor/k8s.io/kubernetes/pkg/client/restclient/url_utils.go
+++ b/vendor/k8s.io/kubernetes/pkg/client/restclient/url_utils.go
@@ -33,10 +33,7 @@ func DefaultServerURL(host, apiPath string, groupVersion unversioned.GroupVersio
 	}
 	base := host
 	hostURL, err := url.Parse(base)
-	if err != nil {
-		return nil, "", err
-	}
-	if hostURL.Scheme == "" || hostURL.Host == "" {
+	if err != nil || hostURL.Scheme == "" || hostURL.Host == "" {
 		scheme := "http://"
 		if defaultTLS {
 			scheme = "https://"