diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 881b6855..b48bf429 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -268,323 +268,323 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "184e700b32b7f1b532b9fce8dd8c1f412d297c4b"
+			"Rev": "d216743eed4c3242b85d094d2a589f41a793652d"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "e226be1f5ed46b19fedc971f410f84de5b3dab8a"
+			"Rev": "084add7e300b3c88d77dded09a20d5063d632b5b"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/tools/leaderelection/leaderelection.go b/tools/leaderelection/leaderelection.go
index e41b420c..aed55574 100644
--- a/tools/leaderelection/leaderelection.go
+++ b/tools/leaderelection/leaderelection.go
@@ -74,6 +74,16 @@ func NewLeaderElector(lec LeaderElectionConfig) (*LeaderElector, error) {
 	if lec.RenewDeadline <= time.Duration(JitterFactor*float64(lec.RetryPeriod)) {
 		return nil, fmt.Errorf("renewDeadline must be greater than retryPeriod*JitterFactor")
 	}
+	if lec.LeaseDuration < 1 {
+		return nil, fmt.Errorf("leaseDuration must be greater than zero")
+	}
+	if lec.RenewDeadline < 1 {
+		return nil, fmt.Errorf("renewDeadline must be greater than zero")
+	}
+	if lec.RetryPeriod < 1 {
+		return nil, fmt.Errorf("retryPeriod must be greater than zero")
+	}
+
 	if lec.Lock == nil {
 		return nil, fmt.Errorf("Lock must not be nil.")
 	}