diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
index 11f0ca8594..331cdc4050 100644
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c
@@ -250,9 +250,7 @@ AcpiPlatformEntryPoint (
                   NULL,
                   (VOID**)&AcpiTable
                   );
-  if (EFI_ERROR (Status)) {
-    return EFI_ABORTED;
-  }
+  ASSERT_EFI_ERROR (Status);
 
   if (XenDetected ()) {
     Status = InstallXenTables (AcpiTable);
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
index d75394c0f8..a4a71f9c3b 100644
--- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
+++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
@@ -714,9 +714,7 @@ QemuFwCfgAcpiPlatformEntryPoint (
                   NULL,
                   (VOID**)&AcpiTable
                   );
-  if (EFI_ERROR (Status)) {
-    return EFI_ABORTED;
-  }
+  ASSERT_EFI_ERROR (Status);
 
   Status = InstallAllQemuLinkedTables (AcpiTable);
   return Status;