diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c
index f918167cc61..868e1b48ffa 100644
--- a/hal/halx86/generic/halinit.c
+++ b/hal/halx86/generic/halinit.c
@@ -72,6 +72,7 @@ HalInitSystem(IN ULONG BootPhase,
               IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     PKPRCB Prcb = KeGetCurrentPrcb();
+    NTSTATUS Status;
 
     /* Check the boot phase */
     if (BootPhase == 0)
@@ -97,7 +98,11 @@ HalInitSystem(IN ULONG BootPhase,
         }
 
         /* Initialize ACPI */
-        HalpSetupAcpiPhase0(LoaderBlock);
+        Status = HalpSetupAcpiPhase0(LoaderBlock);
+        if (!NT_SUCCESS(Status))
+        {
+            KeBugCheckEx(ACPI_BIOS_ERROR, Status, 0, 0, 0);
+        }
 
         /* Initialize the PICs */
         HalpInitializePICs(TRUE);
diff --git a/hal/halx86/legacy/halpcat.c b/hal/halx86/legacy/halpcat.c
index 445b6924201..36fc91603cf 100644
--- a/hal/halx86/legacy/halpcat.c
+++ b/hal/halx86/legacy/halpcat.c
@@ -35,7 +35,7 @@ NTAPI
 HalpSetupAcpiPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     /* There is no ACPI on these HALs */
-    return STATUS_NO_SUCH_DEVICE;
+    return STATUS_SUCCESS;
 }
 
 CODE_SEG("INIT")