diff --git a/libpldm/platform.c b/libpldm/platform.c
index 3f91ee9..9b0403f 100644
--- a/libpldm/platform.c
+++ b/libpldm/platform.c
@@ -40,7 +40,8 @@
 		return rc;
 	}
 
-	if (comp_effecter_count < 0x1 || comp_effecter_count > 0x8) {
+	if (comp_effecter_count < 0x1 || comp_effecter_count > 0x8 ||
+	    field == NULL) {
 		return PLDM_ERROR_INVALID_DATA;
 	}
 
diff --git a/libpldm/platform.h b/libpldm/platform.h
index 649189d..5d80511 100644
--- a/libpldm/platform.h
+++ b/libpldm/platform.h
@@ -48,6 +48,8 @@
 #define PLDM_PDR_REPOSITORY_CHG_EVENT_MIN_LENGTH 2
 #define PLDM_PDR_REPOSITORY_CHANGE_RECORD_MIN_LENGTH 2
 
+#define PLDM_INVALID_EFFECTER_ID 0xFFFF
+
 enum pldm_effecter_data_size {
 	PLDM_EFFECTER_DATA_SIZE_UINT8,
 	PLDM_EFFECTER_DATA_SIZE_SINT8,