diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
index 5b326721ba..8a3f632bf4 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Package.c
@@ -802,7 +802,6 @@ NewOrAddPackNotify (
     // Reparse the FormSet.
     //
     ThunkContext->FormSet = ParseFormSet (ThunkContext->UefiHiiHandle);
-    ASSERT (ThunkContext->FormSet != NULL);
   }
 
   return Status;  
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index e74830de56..4610c90dec 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -894,7 +894,10 @@ ParseFormSet (
 
   CopyGuid (&FormSetGuid, &gZeroGuid);
   Status = InitializeFormSet (UefiHiiHandle, &FormSetGuid, FormSet);
-  ASSERT_EFI_ERROR (Status);
+  if (EFI_ERROR (Status)) {
+    FreePool (FormSet);
+    return NULL;
+  }
 
   return FormSet;
 }