diff --git a/MdeModulePkg/Core/PiSmmCore/Locate.c b/MdeModulePkg/Core/PiSmmCore/Locate.c
index ca95ee4e17..00b2c892e7 100644
--- a/MdeModulePkg/Core/PiSmmCore/Locate.c
+++ b/MdeModulePkg/Core/PiSmmCore/Locate.c
@@ -398,6 +398,7 @@ SmmLocateHandle (
     *BufferSize = ResultSize;
 
     if (SearchType == ByRegisterNotify && !EFI_ERROR(Status)) {
+      ASSERT (SearchKey != NULL);
       //
       // If this is a search by register notify and a handle was
       // returned, update the register notification position
diff --git a/MdeModulePkg/Core/PiSmmCore/Pool.c b/MdeModulePkg/Core/PiSmmCore/Pool.c
index 443faab34f..d7f80f4f8c 100644
--- a/MdeModulePkg/Core/PiSmmCore/Pool.c
+++ b/MdeModulePkg/Core/PiSmmCore/Pool.c
@@ -97,6 +97,7 @@ InternalAllocPoolByIndex (
   EFI_STATUS        Status;
   FREE_POOL_HEADER  *Hdr;
 
+  ASSERT (PoolIndex <= MAX_POOL_INDEX);
   Status = EFI_SUCCESS;
   if (PoolIndex == MAX_POOL_INDEX) {
     Hdr = (FREE_POOL_HEADER *)AllocatePages (EFI_SIZE_TO_PAGES (MAX_POOL_SIZE << 1));