1 files changed, 5 insertions, 2 deletions
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
index 03b0d39f..39f7de1d 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
@@ -42,8 +42,11 @@ EXTERN_C Int32 hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) {
                          handover_hdr->f_HardwareTables.f_ImageHandle);
 
   kKernelVM = kHandoverHeader->f_PageStart;
-
-  MUST_PASS(kKernelVM);
+  
+  if (!kKernelVM) {
+    MUST_PASS(kKernelVM);
+    return kEfiFail;
+  }
 
   hal_write_cr3(kKernelVM);