diff --git a/src/iec61850/client/ied_connection.c b/src/iec61850/client/ied_connection.c
index dd65e4d7..d59c3629 100644
--- a/src/iec61850/client/ied_connection.c
+++ b/src/iec61850/client/ied_connection.c
@@ -264,10 +264,10 @@ ClientDataSet_create(const char* dataSetReference)
 void
 ClientDataSet_destroy(ClientDataSet self)
 {
-    if (self->dataSetValues != NULL)
-        MmsValue_delete(self->dataSetValues);
+	if (self == NULL)
+		return;
 
-    GLOBAL_FREEMEM(self->dataSetReference);
+	MmsValue_delete(self->dataSetValues);
 
     GLOBAL_FREEMEM(self);
 }