diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c
index 63f58d4a..bd20d9f4 100644
--- a/src/iec61850/server/mms_mapping/mms_mapping.c
+++ b/src/iec61850/server/mms_mapping/mms_mapping.c
@@ -3736,6 +3736,7 @@ MmsMapping_createDataSetByNamedVariableList(MmsMapping* self, MmsNamedVariableLi
         dataSetEntry->index = listEntry->arrayIndex;
         dataSetEntry->componentName = listEntry->componentName;
         dataSetEntry->sibling = NULL;
+        dataSetEntry->value = NULL;
 
         if (lastDataSetEntry == NULL)
             dataSet->fcdas =dataSetEntry;
diff --git a/src/iec61850/server/mms_mapping/reporting.c b/src/iec61850/server/mms_mapping/reporting.c
index 30a7ace4..5fa77fd0 100644
--- a/src/iec61850/server/mms_mapping/reporting.c
+++ b/src/iec61850/server/mms_mapping/reporting.c
@@ -2576,7 +2576,7 @@ sendNextReportEntrySegment(ReportControl* self)
 
     MmsValue rptId;
     rptId.type = MMS_VISIBLE_STRING;
-    rptId.value.visibleString.size = sizeof(rptIdBuf);
+    rptId.value.visibleString.size = sizeof(rptIdBuf) - 1;
     rptId.value.visibleString.buf = rptIdBuf;
 
     MmsValue* rptIdFromRcb = ReportControl_getRCBValue(self, "RptID");