Index: UefiHandleParsingLib.c
===================================================================
--- UefiHandleParsingLib.c	(revision 16466)
+++ UefiHandleParsingLib.c	(working copy)
@@ -643,18 +643,22 @@
                                    );
   if (EFI_ERROR (Status)) {
     TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_GET_SUPP_TYPES_FAILED), NULL);
+    ASSERT (TempStr != NULL);
     RetVal = CatSPrint (RetVal, TempStr, Status);
   } else {
     TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_SUPP_TYPE_HEADER), NULL);
+    ASSERT (TempStr != NULL);
     RetVal = CatSPrint (RetVal, TempStr);
     SHELL_FREE_NON_NULL (TempStr);
 
     for (GuidIndex = 0; GuidIndex < InfoTypesBufferCount; GuidIndex++) {
       TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_GUID_NUMBER), NULL);
+      ASSERT (TempStr != NULL);
       RetVal = CatSPrint (RetVal, TempStr, (GuidIndex + 1), InfoTypesBuffer[GuidIndex]);
       SHELL_FREE_NON_NULL (TempStr);
 
       TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_GUID_STRING), NULL);
+      ASSERT (TempStr != NULL);
 
       if (CompareGuid (&InfoTypesBuffer[GuidIndex], &gEfiAdapterInfoMediaStateGuid)) {
         RetVal = CatSPrint (RetVal, TempStr, L"gEfiAdapterInfoMediaStateGuid");
@@ -694,10 +698,12 @@
 
       if (EFI_ERROR (Status)) {
         TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_GETINFO_FAILED), NULL);
+        ASSERT (TempStr != NULL);
         RetVal = CatSPrint (RetVal, TempStr, Status);
       } else {
         if (CompareGuid (&InfoTypesBuffer[GuidIndex], &gEfiAdapterInfoMediaStateGuid)) {
           TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_MEDIA_STATE), NULL);
+          ASSERT (TempStr != NULL);
           RetVal = CatSPrint (
                      RetVal,
                      TempStr,
@@ -706,6 +712,7 @@
                      );
         } else if (CompareGuid (&InfoTypesBuffer[GuidIndex], &gEfiAdapterInfoNetworkBootGuid)) {
           TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_NETWORK_BOOT_INFO), NULL);
+          ASSERT (TempStr != NULL);
           RetVal = CatSPrint (
                      RetVal,
                      TempStr,
@@ -720,6 +727,7 @@
                      );
         } else if (CompareGuid (&InfoTypesBuffer[GuidIndex], &gEfiAdapterInfoSanMacAddressGuid) == TRUE) { 
           TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_SAN_MAC_ADDRESS_INFO), NULL);
+          ASSERT (TempStr != NULL);
           RetVal = CatSPrint (
                      RetVal,
                      TempStr,
@@ -732,6 +740,7 @@
                      );   
         } else {
           TempStr = HiiGetString (mHandleParsingHiiHandle, STRING_TOKEN(STR_UNKNOWN_INFO_TYPE), NULL);
+          ASSERT (TempStr != NULL);
           RetVal = CatSPrint (RetVal, TempStr, &InfoTypesBuffer[GuidIndex]);
         }
       }