diff --git a/pldmtool/oem/ibm/pldm_oem_ibm.cpp b/pldmtool/oem/ibm/pldm_oem_ibm.cpp
index 317dbfa..5f96654 100644
--- a/pldmtool/oem/ibm/pldm_oem_ibm.cpp
+++ b/pldmtool/oem/ibm/pldm_oem_ibm.cpp
@@ -159,7 +159,7 @@
 
     void printFileAttrTable(uint8_t* data, size_t length)
     {
-        if (data == NULL || length == 0)
+        if (data == nullptr || length == 0)
         {
             return;
         }
diff --git a/pldmtool/pldm_platform_cmd.cpp b/pldmtool/pldm_platform_cmd.cpp
index 0a96274..d2c1c7d 100644
--- a/pldmtool/pldm_platform_cmd.cpp
+++ b/pldmtool/pldm_platform_cmd.cpp
@@ -846,7 +846,7 @@
 
     void printPDRFruRecordSet(uint8_t* data, ordered_json& output)
     {
-        if (data == NULL)
+        if (data == nullptr)
         {
             return;
         }
@@ -874,7 +874,7 @@
             {PLDM_ENTITY_ASSOCIAION_LOGICAL, "Logical"},
         };
 
-        if (data == NULL)
+        if (data == nullptr)
         {
             return;
         }
@@ -1495,7 +1495,7 @@
     void printPDRMsg(uint32_t& nextRecordHndl, const uint16_t respCnt,
                      uint8_t* data, std::optional<uint16_t> terminusHandle)
     {
-        if (data == NULL)
+        if (data == nullptr)
         {
             std::cerr << "Failed to get PDR message" << std::endl;
             return;