diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index d07c0bfb..c61e6e40 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -420,207 +420,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "46b17dfe5118ea572340b3b9034af2108ad5301e"
+			"Rev": "03ac7a9ade429d715a1a46ceaa3724c18ebae54f"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
diff --git a/rest/request.go b/rest/request.go
index dd063038..48fb4e67 100644
--- a/rest/request.go
+++ b/rest/request.go
@@ -592,7 +592,7 @@ func (r *Request) WatchWithSpecificDecoders(wrapperDecoderFn func(io.ReadCloser)
 		if result := r.transformResponse(resp, req); result.err != nil {
 			return nil, result.err
 		}
-		return nil, fmt.Errorf("for request '%+v', got status: %v", url, resp.StatusCode)
+		return nil, fmt.Errorf("for request %s, got status: %v", url, resp.StatusCode)
 	}
 	wrapperDecoder := wrapperDecoderFn(resp.Body)
 	return watch.NewStreamWatcher(restclientwatch.NewDecoder(wrapperDecoder, embeddedDecoder)), nil
@@ -845,13 +845,13 @@ func (r *Request) transformResponse(resp *http.Response, req *http.Request) Resu
 			// 3. Apiserver closes connection.
 			// 4. client-go should catch this and return an error.
 			klog.V(2).Infof("Stream error %#v when reading response body, may be caused by closed connection.", err)
-			streamErr := fmt.Errorf("Stream error %#v when reading response body, may be caused by closed connection. Please retry.", err)
+			streamErr := fmt.Errorf("Stream error when reading response body, may be caused by closed connection. Please retry. Original error: %v", err)
 			return Result{
 				err: streamErr,
 			}
 		default:
-			klog.Errorf("Unexpected error when reading response body: %#v", err)
-			unexpectedErr := fmt.Errorf("Unexpected error %#v when reading response body. Please retry.", err)
+			klog.Errorf("Unexpected error when reading response body: %v", err)
+			unexpectedErr := fmt.Errorf("Unexpected error when reading response body. Please retry. Original error: %v", err)
 			return Result{
 				err: unexpectedErr,
 			}
diff --git a/tools/cache/shared_informer.go b/tools/cache/shared_informer.go
index b2f3dba0..9715d344 100644
--- a/tools/cache/shared_informer.go
+++ b/tools/cache/shared_informer.go
@@ -555,7 +555,7 @@ func (p *processorListener) run() {
 				case deleteNotification:
 					p.handler.OnDelete(notification.oldObj)
 				default:
-					utilruntime.HandleError(fmt.Errorf("unrecognized notification: %#v", next))
+					utilruntime.HandleError(fmt.Errorf("unrecognized notification: %T", next))
 				}
 			}
 			// the only way to get here is if the p.nextCh is empty and closed