diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 94fd90c5..9622ab51 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -400,207 +400,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "99c5fa21f87204c2875a7f7ba977895d79b35c44"
+			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/tools/leaderelection/resourcelock/configmaplock.go b/tools/leaderelection/resourcelock/configmaplock.go
index 4ff59560..c12daad0 100644
--- a/tools/leaderelection/resourcelock/configmaplock.go
+++ b/tools/leaderelection/resourcelock/configmaplock.go
@@ -80,7 +80,7 @@ func (cml *ConfigMapLock) Create(ler LeaderElectionRecord) error {
 // Update will update an existing annotation on a given resource.
 func (cml *ConfigMapLock) Update(ler LeaderElectionRecord) error {
 	if cml.cm == nil {
-		return errors.New("endpoint not initialized, call get or create first")
+		return errors.New("configmap not initialized, call get or create first")
 	}
 	recordBytes, err := json.Marshal(ler)
 	if err != nil {