diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index b5fc70e1..c3af91f3 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -372,323 +372,323 @@
     },
     {
       "ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1beta2",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/authentication/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/authentication/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/authorization/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/authorization/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/autoscaling/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/autoscaling/v2beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/batch/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/batch/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/batch/v2alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/certificates/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/core/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/extensions/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/networking/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/policy/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/scheduling/v1alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/settings/v1alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/storage/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/storage/v1alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/api/storage/v1beta1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "ee50df89e1d51862db9e60e3f2d731ca25da5576"
+      "Rev": "89823107ac34d28589e61a8e8a52b282df0c3f9e"
     },
     {
       "ImportPath": "k8s.io/kube-openapi/pkg/common",
diff --git a/plugin/pkg/client/auth/gcp/gcp.go b/plugin/pkg/client/auth/gcp/gcp.go
index d2e622ba..5ed1203b 100644
--- a/plugin/pkg/client/auth/gcp/gcp.go
+++ b/plugin/pkg/client/auth/gcp/gcp.go
@@ -228,9 +228,11 @@ func newCmdTokenSource(cmd string, args []string, tokenKey, expiryKey, timeFmt s
 func (c *commandTokenSource) Token() (*oauth2.Token, error) {
 	fullCmd := strings.Join(append([]string{c.cmd}, c.args...), " ")
 	cmd := execCommand(c.cmd, c.args...)
+	var stderr bytes.Buffer
+	cmd.Stderr = &stderr
 	output, err := cmd.Output()
 	if err != nil {
-		return nil, fmt.Errorf("error executing access token command %q: err=%v output=%s", fullCmd, err, output)
+		return nil, fmt.Errorf("error executing access token command %q: err=%v output=%s stderr=%s", fullCmd, err, output, string(stderr.Bytes()))
 	}
 	token, err := c.parseTokenCmdOutput(output)
 	if err != nil {