diff --git a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
index ef0c10545e..64e4e4a46c 100644
--- a/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
+++ b/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
@@ -1446,7 +1446,7 @@ arch_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
 
 	if (physicalPageDirectory == (addr_t)sKernelPhysicalPageDirectory) {
 		pageDirectoryEntry = sKernelVirtualPageDirectory[index];
-	} else {
+	} else if (sPhysicalPageMapper != NULL) {
 		// map the original page directory and get the entry
 		void* handle;
 		addr_t virtualPageDirectory;
@@ -1459,13 +1459,15 @@ arch_vm_translation_map_is_kernel_page_accessible(addr_t virtualAddress,
 				handle);
 		} else
 			pageDirectoryEntry = 0;
-	}
+	} else
+		pageDirectoryEntry = 0;
 
 	// map the page table and get the entry
 	page_table_entry pageTableEntry;
 	index = VADDR_TO_PTENT(virtualAddress);
 
-	if ((pageDirectoryEntry & X86_PDE_PRESENT) != 0) {
+	if ((pageDirectoryEntry & X86_PDE_PRESENT) != 0
+			&& sPhysicalPageMapper != NULL) {
 		void* handle;
 		addr_t virtualPageTable;
 		status_t error = sPhysicalPageMapper->GetPageDebug(
diff --git a/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp b/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp
index e8ac2a0a8b..82ba13d47b 100644
--- a/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp
+++ b/src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp
@@ -918,8 +918,9 @@ large_memory_physical_page_ops_init(kernel_args* args,
 	X86PhysicalPageMapper*& _pageMapper,
 	TranslationMapPhysicalPageMapper*& _kernelPageMapper)
 {
-	_pageMapper = new(&sPhysicalPageMapper) LargeMemoryPhysicalPageMapper;
+	new(&sPhysicalPageMapper) LargeMemoryPhysicalPageMapper;
 	sPhysicalPageMapper.Init(args, _kernelPageMapper);
 
+	_pageMapper = &sPhysicalPageMapper;
 	return B_OK;
 }