diff --git a/pkg/apis/batch/v1/conversion.go b/pkg/apis/batch/v1/conversion.go
index 51ab2b1672..bd952b0e80 100644
--- a/pkg/apis/batch/v1/conversion.go
+++ b/pkg/apis/batch/v1/conversion.go
@@ -41,7 +41,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
 			case "metadata.name", "metadata.namespace", "status.successful":
 				return label, value, nil
 			default:
-				return "", "", fmt.Errorf("field label not supported: %s", label)
+				return "", "", fmt.Errorf("field label %q not supported for Job", label)
 			}
 		},
 	)
diff --git a/pkg/apis/batch/v2alpha1/conversion.go b/pkg/apis/batch/v2alpha1/conversion.go
index 510f10cebd..cf71106edf 100644
--- a/pkg/apis/batch/v2alpha1/conversion.go
+++ b/pkg/apis/batch/v2alpha1/conversion.go
@@ -36,14 +36,15 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
 	}
 
 	// Add field label conversions for kinds having selectable nothing but ObjectMeta fields.
-	for _, kind := range []string{"Job", "JobTemplate", "CronJob"} {
+	for _, k := range []string{"Job", "JobTemplate", "CronJob"} {
+		kind := k // don't close over range variables
 		err = scheme.AddFieldLabelConversionFunc("batch/v2alpha1", kind,
 			func(label, value string) (string, string, error) {
 				switch label {
 				case "metadata.name", "metadata.namespace", "status.successful":
 					return label, value, nil
 				default:
-					return "", "", fmt.Errorf("field label not supported: %s", label)
+					return "", "", fmt.Errorf("field label %q not supported for %q", label, kind)
 				}
 			})
 		if err != nil {