3 files changed, 6 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
index a34fa48e45..cbc848170e 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
@@ -129,7 +129,8 @@ SerialStatusCodeReportWorker (
                   Value,
                   Instance
                   );
-  } else if (CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
+  } else if (Data != NULL &&
+             CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
              ((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {
     //
     // EFI_STATUS_CODE_STRING_DATA
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
index 8024f2f5df..6267725751 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
@@ -125,7 +125,8 @@ SerialStatusCodeReportWorker (
                   Value, 
                   Instance
                   );
-  } else if (CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
+  } else if (Data != NULL &&
+             CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
              ((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {
     //
     // EFI_STATUS_CODE_STRING_DATA
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
index 408511ef97..27a243be06 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
@@ -125,7 +125,8 @@ SerialStatusCodeReportWorker (
                   Value, 
                   Instance
                   );
-  } else if (CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
+  } else if (Data != NULL &&
+             CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
              ((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {
     //
     // EFI_STATUS_CODE_STRING_DATA