diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index bc87c4e6a1..f14a746529 100644
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -1002,7 +1002,10 @@ LibPcdGetNextToken (
   IN UINTN                    TokenNumber
   )
 {
-  GetPiPcdProtocol()->GetNextToken (Guid, &TokenNumber);
+  EFI_STATUS    Status;
+
+  Status = GetPiPcdProtocol()->GetNextToken (Guid, &TokenNumber);
+  ASSERT (!EFI_ERROR (Status) || TokenNumber == 0);
 
   return TokenNumber;
 }
diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index a57751f412..31ff457fc8 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -1010,7 +1010,10 @@ LibPcdGetNextToken (
   IN UINTN                    TokenNumber
   )
 {
-  (GetPiPcdPpiPointer ())->GetNextToken (Guid, &TokenNumber);
+  EFI_STATUS    Status;
+
+  Status = (GetPiPcdPpiPointer ())->GetNextToken (Guid, &TokenNumber);
+  ASSERT (!EFI_ERROR (Status) || TokenNumber == 0);
 
   return TokenNumber;
 }