diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
index d7d4df6ebc..756787e27b 100644
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
@@ -73,7 +73,7 @@ EFI_PEI_PPI_DESCRIPTOR     mReadOnlyVariableThunkPresent = {
     (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
     &gPeiReadonlyVariableThunkPresentPpiGuid,
     NULL
-  };
+};
 
 EFI_STATUS
 EFIAPI
@@ -109,7 +109,9 @@ Returns:
   Status = PeiServicesLocatePpi (&gPeiReadonlyVariableThunkPresentPpiGuid, 0, NULL, &Interface);
   ASSERT (Status == EFI_NOT_FOUND);
   
-  PeiServicesInstallPpi (&mReadOnlyVariableThunkPresent);
+  Status = PeiServicesInstallPpi (&mReadOnlyVariableThunkPresent);
+  ASSERT_EFI_ERROR (Status);
+  
   //
   // Publish the variable capability to other modules
   //
diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c
index fcb6fb53f1..0e531e3a5f 100644
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c
@@ -66,6 +66,13 @@ EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
   &mVariablePpi
 };
 
+EFI_PEI_PPI_DESCRIPTOR     mReadOnlyVariableThunkPresent = {
+    (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
+    &gPeiReadonlyVariableThunkPresentPpiGuid,
+    NULL
+};
+
+
 /**
   Standard entry point of a PEIM.
 
@@ -92,6 +99,9 @@ PeimInitializeReadOnlyVariable (
   Status = PeiServicesLocatePpi (&gPeiReadonlyVariableThunkPresentPpiGuid, 0, NULL, &Interface);
   ASSERT (Status == EFI_NOT_FOUND);
 
+  Status = PeiServicesInstallPpi (&mReadOnlyVariableThunkPresent);
+  ASSERT_EFI_ERROR (Status);
+
   //
   // Publish the variable capability to other modules
   //