diff --git a/controller/nucleus/networkElementServiceMock.go b/controller/nucleus/networkElementServiceMock.go
index 4735109b86c53ab5e841aa4478af9d3042b5cffc..78b9f60f4d5a7f87cd1ba127ca025552af3661ce 100644
--- a/controller/nucleus/networkElementServiceMock.go
+++ b/controller/nucleus/networkElementServiceMock.go
@@ -1,6 +1,7 @@
 package nucleus
 
 import (
+	"code.fbi.h-da.de/danet/gosdn/controller/customerrs"
 	"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkelement"
 	"code.fbi.h-da.de/danet/gosdn/controller/store"
 	"github.com/google/uuid"
@@ -66,12 +67,12 @@ func (t *NetworkElementServiceMock) Get(query store.Query) (networkelement.Netwo
 		// Second search for name
 		id, ok := t.nameLookupTable[query.Name]
 		if !ok {
-			return nil, nil
+			return nil, customerrs.CouldNotFindError{Name: query.Name}
 		}
 
 		item, ok := t.Store[id]
 		if !ok {
-			return nil, nil
+			return nil, customerrs.CouldNotFindError{ID: id}
 		}
 
 		return item, nil
diff --git a/controller/nucleus/pluginServiceMock.go b/controller/nucleus/pluginServiceMock.go
index a580657fcd7c203ea0bcbb51260c021f3f71d124..0cdfa6b8f216efba9071e6c322af399e983c4ab0 100644
--- a/controller/nucleus/pluginServiceMock.go
+++ b/controller/nucleus/pluginServiceMock.go
@@ -62,5 +62,5 @@ func (t *PluginServiceMock) GetAll() ([]plugin.Plugin, error) {
 // RequestPlugin is a mock for requesting a plugin from the registry.
 // TODO: add plugin mock here.
 func (t *PluginServiceMock) RequestPlugin(uuid.UUID) (plugin.Plugin, error) {
-	return nil, nil
+	return nil, nil //nolint:nilnil
 }