diff --git a/pkg/k8sclient/k8sclient.go b/pkg/k8sclient/k8sclient.go
index a8f29e4af..776f801d2 100644
--- a/pkg/k8sclient/k8sclient.go
+++ b/pkg/k8sclient/k8sclient.go
@@ -190,7 +190,7 @@ func parsePodNetworkAnnotation(podNetworks, defaultNamespace string) ([]*types.N
 		return nil, logging.Errorf("parsePodNetworkAnnotation: pod annotation does not have \"network\" as key")
 	}
 
-	if strings.IndexAny(podNetworks, "[{\"") >= 0 {
+	if strings.ContainsAny(podNetworks, "[{\"") {
 		if err := json.Unmarshal([]byte(podNetworks), &networks); err != nil {
 			return nil, logging.Errorf("parsePodNetworkAnnotation: failed to parse pod Network Attachment Selection Annotation JSON format: %v", err)
 		}
diff --git a/pkg/server/api/shim.go b/pkg/server/api/shim.go
index 167723261..0dd6d31b6 100644
--- a/pkg/server/api/shim.go
+++ b/pkg/server/api/shim.go
@@ -44,8 +44,7 @@ type ShimNetConf struct {
 func CmdAdd(args *skel.CmdArgs) error {
 	response, cniVersion, err := postRequest(args)
 	if err != nil {
-		logging.Errorf("CmdAdd (shim): %v", err)
-		return err
+		return logging.Errorf("CmdAdd (shim): %v", err)
 	}
 
 	logging.Verbosef("CmdAdd (shim): %v", *response.Result)
@@ -56,8 +55,7 @@ func CmdAdd(args *skel.CmdArgs) error {
 func CmdCheck(args *skel.CmdArgs) error {
 	_, _, err := postRequest(args)
 	if err != nil {
-		logging.Errorf("CmdCheck (shim): %v", err)
-		return err
+		return logging.Errorf("CmdCheck (shim): %v", err)
 	}
 
 	return err
@@ -67,10 +65,8 @@ func CmdCheck(args *skel.CmdArgs) error {
 func CmdDel(args *skel.CmdArgs) error {
 	_, _, err := postRequest(args)
 	if err != nil {
-		logging.Errorf("CmdDel (shim): %v", err)
-		return nil
+		return logging.Errorf("CmdDel (shim): %v", err)
 	}
-
 	return nil
 }
 
diff --git a/pkg/server/config/manager.go b/pkg/server/config/manager.go
index 4fcb2fc65..9e961bc22 100644
--- a/pkg/server/config/manager.go
+++ b/pkg/server/config/manager.go
@@ -89,7 +89,10 @@ func overrideCNIVersion(cniConfigFile string, multusCNIVersion string) error {
 
 func newManager(config MultusConf, multusConfigDir, defaultCNIPluginName string, forceCNIVersion bool) (*Manager, error) {
 	if forceCNIVersion {
-		overrideCNIVersion(cniPluginConfigFilePath(multusConfigDir, defaultCNIPluginName), config.CNIVersion)
+		err := overrideCNIVersion(cniPluginConfigFilePath(multusConfigDir, defaultCNIPluginName), config.CNIVersion)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	watcher, err := newWatcher(multusConfigDir)