diff --git a/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go b/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go
index e0d1715420e..60dfa8d1740 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go
@@ -397,7 +397,7 @@ func IsValidSocketAddr(value string) []string {
 	var errs []string
 	ip, port, err := net.SplitHostPort(value)
 	if err != nil {
-		return append(errs, "must be a valid socket address format, (e.g. 0.0.0.0:10254 or [::]:10254)")
+		errs = append(errs, "must be a valid socket address format, (e.g. 0.0.0.0:10254 or [::]:10254)")
 		return errs
 	}
 	portInt, _ := strconv.Atoi(port)
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go
index 47b198704a0..4938e94c30e 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go
@@ -884,7 +884,6 @@ func TestFinishRequest(t *testing.T) {
 			timeout: time.Second,
 			fn: func() (runtime.Object, error) {
 				panic("my panic")
-				return nil, nil
 			},
 			expectedObj:   nil,
 			expectedErr:   nil,
@@ -895,7 +894,6 @@ func TestFinishRequest(t *testing.T) {
 			timeout: time.Second,
 			fn: func() (runtime.Object, error) {
 				panic("my panic")
-				return nil, nil
 			},
 			expectedObj:   nil,
 			expectedErr:   nil,