diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c
index ea6bef22..e30df327 100644
--- a/src/iec61850/server/mms_mapping/control.c
+++ b/src/iec61850/server/mms_mapping/control.c
@@ -348,6 +348,9 @@ convertCheckHandlerResultToServiceError(CheckHandlerResult controlHandlerResult)
 static void
 updateGenericTrackingObjectValues(MmsMapping* self, ControlObject* controlObject, IEC61850_ServiceType serviceType, IEC61850_ServiceError errVal)
 {
+    if (controlObject == NULL)
+        return;
+
     copyControlValuesToTrackingObject(self, controlObject, serviceType);
 
     ServiceTrkInstance trkInst = NULL;