diff --git a/pkg/agent/containerd/config.go b/pkg/agent/containerd/config.go
index b139c4aa725..077e60b195b 100644
--- a/pkg/agent/containerd/config.go
+++ b/pkg/agent/containerd/config.go
@@ -162,17 +162,17 @@ func getHostConfigs(registry *registries.Registry, noDefaultEndpoint bool, mirro
 		// create the default config, if it wasn't explicitly mentioned in the config section
 		config, ok := hosts[host]
 		if !ok {
-			if c, err := defaultHostConfig(host, mirrorAddr, configForHost(registry.Configs, host)); err != nil {
+			c, err := defaultHostConfig(host, mirrorAddr, configForHost(registry.Configs, host))
+			if err != nil {
 				logrus.Errorf("Failed to generate config for registry %s: %v", host, err)
 				continue
-			} else {
-				if noDefaultEndpoint {
-					c.Default = nil
-				} else if host == "*" {
-					c.Default = &templates.RegistryEndpoint{URL: &url.URL{}}
-				}
-				config = *c
 			}
+			if noDefaultEndpoint {
+				c.Default = nil
+			} else if host == "*" {
+				c.Default = &templates.RegistryEndpoint{URL: &url.URL{}}
+			}
+			config = *c
 		}
 
 		// track which endpoints we've already seen to avoid creating duplicates
diff --git a/pkg/rootlessports/controller.go b/pkg/rootlessports/controller.go
index 0295fd6ba76..784ae288d6d 100644
--- a/pkg/rootlessports/controller.go
+++ b/pkg/rootlessports/controller.go
@@ -34,11 +34,11 @@ func Register(ctx context.Context, serviceController corev1.ServiceController, e
 		rootlessClient, err = client.New(rootless.Sock)
 		if err == nil {
 			break
-		} else {
-			logrus.Infof("Waiting for rootless API socket %s: %v", rootless.Sock, err)
-			time.Sleep(1 * time.Second)
 		}
+		logrus.Infof("Waiting for rootless API socket %s: %v", rootless.Sock, err)
+		time.Sleep(1 * time.Second)
 	}
+
 	if err != nil {
 		return err
 	}