diff --git a/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h b/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
index ef24b3ad7a..e66bebe92c 100644
--- a/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
+++ b/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
@@ -16,9 +16,9 @@
 
 // must match SMP_MAX_CPUS in arch_smp.h
 #define MAX_BOOT_CPUS 8
-#define MAX_PHYSICAL_MEMORY_RANGE 8
-#define MAX_PHYSICAL_ALLOCATED_RANGE 8
-#define MAX_VIRTUAL_ALLOCATED_RANGE 8
+#define MAX_PHYSICAL_MEMORY_RANGE 32
+#define MAX_PHYSICAL_ALLOCATED_RANGE 32
+#define MAX_VIRTUAL_ALLOCATED_RANGE 32
 
 #define MAX_SERIAL_PORTS 4
 
diff --git a/src/system/boot/platform/bios_ia32/mmu.cpp b/src/system/boot/platform/bios_ia32/mmu.cpp
index 05cb1c68c6..a808be9eaf 100644
--- a/src/system/boot/platform/bios_ia32/mmu.cpp
+++ b/src/system/boot/platform/bios_ia32/mmu.cpp
@@ -676,7 +676,12 @@ mmu_init(void)
 				if (end <= base)
 					continue;
 
-				if (insert_physical_memory_range(base, end - base) != B_OK) {
+				status_t status = insert_physical_memory_range(base, end - base);
+				if (status == B_ENTRY_NOT_FOUND) {
+					panic("mmu_init(): Failed to add physical memory range "
+						"%#" B_PRIx64 " - %#" B_PRIx64 " : all %d entries are "
+						"used already!\n", base, end, MAX_PHYSICAL_MEMORY_RANGE);
+				} else if (status != B_OK) {
 					panic("mmu_init(): Failed to add physical memory range "
 						"%#" B_PRIx64 " - %#" B_PRIx64 "\n", base, end);
 				}