diff --git a/pkg/mocks/mockCoreClient.go b/pkg/mocks/mockCoreClient.go
index b68f60a..1255ab7 100644
--- a/pkg/mocks/mockCoreClient.go
+++ b/pkg/mocks/mockCoreClient.go
@@ -165,13 +165,20 @@
 }
 
 // GetChildDevice implements mock GetChildDevice
-func (mcs MockCoreService) GetChildDevice(ctx context.Context, in *ca.ChildDeviceFilter, opts ...grpc.CallOption) (*voltha.Device, error) {
+func (mcs MockCoreService) GetChildDevice(
+	ctx context.Context,
+	in *ca.ChildDeviceFilter,
+	opts ...grpc.CallOption,
+) (*voltha.Device, error) {
 	if in.ParentId == "" {
 		return nil, errors.New("device detection failed")
 	}
+	if in.OnuId == nil {
+		return nil, errors.New("device detection failed")
+	}
 	var onuDevice *voltha.Device
 	for _, val := range mcs.Devices {
-		if val.GetId() == fmt.Sprintf("%d", in.OnuId) {
+		if val.GetId() == fmt.Sprintf("%d", *in.OnuId) {
 			onuDevice = val
 			break
 		}
@@ -179,7 +186,6 @@
 	if onuDevice != nil {
 		return onuDevice, nil
 	}
-	// return &voltha.Device{}, nil
 	return nil, errors.New("device detection failed")
 }