diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index ad9eb807de..73d36088a5 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -1062,7 +1062,8 @@ BOpt_GetBootOptions (
       FreePool (HiiString);
     } else {
       NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr));
-      StrCpy(NewLoadContext->Description, (UINT16*)LoadOptionPtr);
+      ASSERT (NewLoadContext->Description != NULL);
+      StrCpy (NewLoadContext->Description, (UINT16*)LoadOptionPtr);
     }
     
     ASSERT (NewLoadContext->Description != NULL);
diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
index 6d78a68dd6..6bab4db1f0 100644
--- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
+++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
@@ -1000,6 +1000,7 @@ FindChildNode (
       }
     }
     
+    ASSERT (CurrentChildNode != NULL);
     if (CurrentChildNode->EncapsulatedStreamHandle != NULL_STREAM_HANDLE) {
       //
       // If the current node is an encapsulating node, recurse into it...
@@ -1054,7 +1055,6 @@ FindChildNode (
         if (EFI_ERROR (Status)) {
           return Status;
         }
-        ASSERT (CurrentChildNode != NULL);
       } else {
         ASSERT (EFI_ERROR (ErrorStatus));
         return ErrorStatus;