diff --git a/pkg/build/api/v1beta1/conversion.go b/pkg/build/api/v1beta1/conversion.go
index 246c8790d890..01cf185accb4 100644
--- a/pkg/build/api/v1beta1/conversion.go
+++ b/pkg/build/api/v1beta1/conversion.go
@@ -55,19 +55,17 @@ func init() {
 			out.Image = in.Image
 			out.Scripts = in.Scripts
 			out.Clean = !in.Incremental
-			s.Convert(&in.Env, &out.Env, 0)
-			return nil
+			return s.Convert(&in.Env, &out.Env, 0)
 		},
 		func(in *STIBuildStrategy, out *newer.STIBuildStrategy, s conversion.Scope) error {
 			out.Scripts = in.Scripts
 			out.Incremental = !in.Clean
-			s.Convert(&in.Env, &out.Env, 0)
 			if len(in.Image) != 0 {
 				out.Image = in.Image
 			} else {
 				out.Image = in.BuilderImage
 			}
-			return nil
+			return s.Convert(&in.Env, &out.Env, 0)
 		},
 		// Rename DockerBuildStrategy.BaseImage to DockerBuildStrategy.Image
 		func(in *newer.DockerBuildStrategy, out *DockerBuildStrategy, s conversion.Scope) error {
diff --git a/pkg/config/api/v1beta1/conversion.go b/pkg/config/api/v1beta1/conversion.go
index 27af36896b10..7940d724c991 100644
--- a/pkg/config/api/v1beta1/conversion.go
+++ b/pkg/config/api/v1beta1/conversion.go
@@ -11,14 +11,12 @@ func init() {
 		func(in *newer.Config, out *Config, s conversion.Scope) error {
 			out.ResourceVersion = in.ListMeta.ResourceVersion
 			out.SelfLink = in.ListMeta.SelfLink
-			s.Convert(&in.Items, &out.Items, conversion.DestFromSource)
-			return nil
+			return s.Convert(&in.Items, &out.Items, conversion.DestFromSource)
 		},
 		func(in *Config, out *newer.Config, s conversion.Scope) error {
 			out.ListMeta.ResourceVersion = in.ResourceVersion
 			out.ListMeta.SelfLink = in.SelfLink
-			s.Convert(&in.Items, &out.Items, conversion.DestFromSource)
-			return nil
+			return s.Convert(&in.Items, &out.Items, conversion.DestFromSource)
 		},
 	)
 }