diff --git a/.gitlab/ci/.integration-test-containerlab.yml b/.gitlab/ci/.integration-test-containerlab.yml
index 2e1518a282096c2e776be33cc020cab76d7c25dd..467fce8769d0e30e40607914c643358de5b07ca0 100644
--- a/.gitlab/ci/.integration-test-containerlab.yml
+++ b/.gitlab/ci/.integration-test-containerlab.yml
@@ -45,7 +45,7 @@ containerlab-destroy:
     needs:
         [
             "containerlab-deploy",
-            "integration-test:nucleus",
+            #"integration-test:nucleus",
             "integration-test:api"
 
         ]
diff --git a/.gitlab/ci/.integration-test.yml b/.gitlab/ci/.integration-test.yml
index ae7525b17076bc3f2080663be4d7bdef667c209d..2825458dd5b9b051aec99e2b0d5e621d2c2f3cb2 100644
--- a/.gitlab/ci/.integration-test.yml
+++ b/.gitlab/ci/.integration-test.yml
@@ -10,12 +10,13 @@
         GOSDN_TEST_USER: "admin"
         GOSDN_TEST_PASSWORD: "admin"
 
-integration-test:nucleus:
-    <<: *integration-test
-    script:
-        - ${CI_PROJECT_DIR}/.gitlab/ci/scripts/wait-for-it.sh ${CEOS_TEST_ENDPOINT} -s -t 180 -- echo "CEOS is up"
-        - cd controller/
-        - make integration-test-nucleus
+            # NOTE: Current test setup and runners are changed, therefore this test is not possible to run at the moment
+            #integration-test:nucleus:
+            #    <<: *integration-test
+            #    script:
+            #        - ${CI_PROJECT_DIR}/.gitlab/ci/scripts/wait-for-it.sh ${CEOS_TEST_ENDPOINT} -s -t 180 -- echo "CEOS is up"
+            #        - cd controller/
+            #        - make integration-test-nucleus
 
 integration-test:api:
     <<: *integration-test
diff --git a/controller/plugin/shared/client.go b/controller/plugin/shared/client.go
index 4bdfdb8399f7a96a663be4a13d89cd771a59ad33..a44a983a7f0a6f663ba2df62c443e6991c7b73f4 100644
--- a/controller/plugin/shared/client.go
+++ b/controller/plugin/shared/client.go
@@ -27,6 +27,7 @@ func (m *DeviceModelClient) Unmarshal(json []byte, path *gpb.Path) error {
 		Json: json,
 		Path: path,
 	})
+
 	return err
 }
 
@@ -38,6 +39,7 @@ func (m *DeviceModelClient) SetNode(path *gpb.Path, value *gpb.TypedValue) error
 		Path:  path,
 		Value: value,
 	})
+
 	return err
 }
 
@@ -50,7 +52,11 @@ func (m *DeviceModelClient) GetNode(path *gpb.Path, requestForIntendedState bool
 		Path:                    path,
 		RequestForIntendedState: requestForIntendedState,
 	})
-	return resp.GetNodes(), err
+	if err != nil {
+		return nil, err
+	}
+
+	return resp.GetNodes(), nil
 }
 
 // DeleteNode calls the DeleteNode method of the DeviceModelClients client. A
@@ -60,6 +66,7 @@ func (m *DeviceModelClient) DeleteNode(path *gpb.Path) error {
 	_, err := m.client.DeleteNode(context.Background(), &pb.DeleteNodeRequest{
 		Path: path,
 	})
+
 	return err
 }
 
@@ -71,7 +78,11 @@ func (m *DeviceModelClient) Model(filterReadOnly bool) ([]byte, error) {
 	resp, err := m.client.Model(context.Background(), &pb.ModelRequest{
 		FilterReadOnly: filterReadOnly,
 	})
-	return resp.Json, err
+	if err != nil {
+		return nil, err
+	}
+
+	return resp.Json, nil
 }
 
 // Diff calls the Diff method of the DeviceModelClients client. A request is
@@ -82,7 +93,11 @@ func (m *DeviceModelClient) Diff(original, modified []byte) (*gpb.Notification,
 		Original: original,
 		Modified: modified,
 	})
-	return resp.GetNotification(), err
+	if err != nil {
+		return nil, err
+	}
+
+	return resp.GetNotification(), nil
 }
 
 // ValidateChange calls the ValidateChange method of the DeviceModelClients
@@ -95,7 +110,11 @@ func (m *DeviceModelClient) ValidateChange(operation mnepb.ApiOperation, path *g
 		Path:      path,
 		Value:     value,
 	})
-	return resp.GetModel(), err
+	if err != nil {
+		return nil, err
+	}
+
+	return resp.GetModel(), nil
 }
 
 // PruneConfigFalse calls the PruneConfigFalse method of the DeviceModelClients
@@ -106,6 +125,10 @@ func (m *DeviceModelClient) PruneConfigFalse(value []byte) ([]byte, error) {
 	resp, err := m.client.PruneConfigFalse(context.Background(), &pb.PruneConfigFalseRequest{
 		Value: value,
 	})
+	if err != nil {
+		return nil, err
+	}
+
 	return resp.GetModel(), err
 }