diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
index 76c719a54e..a32b6d6645 100644
--- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
+++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
@@ -541,6 +541,8 @@ GetCapsuleInfo (
   UINTN Count;
   UINTN Size;
 
+  ASSERT (Desc != NULL);
+
   Count = 0;
   Size  = 0;
 
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index 596e8b2d8b..80ccb1995e 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
@@ -973,6 +973,7 @@ SmbiosCreateTable (
   //
   // Assemble the tables
   //
+  ASSERT (EntryPointStructure->TableAddress != 0);
   BufferPointer = (UINT8 *) (UINTN) EntryPointStructure->TableAddress;
   CurrentSmbiosEntry = NULL;
   do {