1 files changed, 15 insertions, 10 deletions
diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
index 5cecf56e14..b31b7379f1 100644
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
+++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
@@ -79,30 +79,35 @@ UefiHiiServicesLibConstructor (
   IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
+  EFI_STATUS Status;
+
   //
-  // Retrieve the pointer to the UEFI HII Font Protocol 
+  // Retrieve the pointer to the UEFI HII String Protocol 
   //
-  gBS->LocateProtocol (&gEfiHiiFontProtocolGuid, NULL, (VOID **) &gHiiFont);
+  Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gHiiString);
+  ASSERT_EFI_ERROR (Status);
 
   //
-  // Retrieve the pointer to the UEFI HII String Protocol 
+  // Retrieve the pointer to the UEFI HII Database Protocol 
   //
-  gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gHiiString);
+  Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);
+  ASSERT_EFI_ERROR (Status);
 
   //
-  // Retrieve the pointer to the UEFI HII Image Protocol 
+  // Retrieve the pointer to the UEFI HII Config Routing Protocol 
   //
-  gBS->LocateProtocol (&gEfiHiiImageProtocolGuid, NULL, (VOID **) &gHiiImage);
+  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &gHiiConfigRouting);
+  ASSERT_EFI_ERROR (Status);
 
   //
-  // Retrieve the pointer to the UEFI HII Database Protocol 
+  // Retrieve the pointer to the optional UEFI HII Font Protocol 
   //
-  gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);
+  gBS->LocateProtocol (&gEfiHiiFontProtocolGuid, NULL, (VOID **) &gHiiFont);
 
   //
-  // Retrieve the pointer to the UEFI HII Config Routing Protocol 
+  // Retrieve the pointer to the optional UEFI HII Image Protocol 
   //
-  gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &gHiiConfigRouting);
+  gBS->LocateProtocol (&gEfiHiiImageProtocolGuid, NULL, (VOID **) &gHiiImage);
 
   return EFI_SUCCESS;
 }