diff --git a/nyx/memory_access.c b/nyx/memory_access.c
index e5e4bcdf30..d2b3203467 100644
--- a/nyx/memory_access.c
+++ b/nyx/memory_access.c
@@ -216,8 +216,14 @@ bool remap_slot(uint64_t addr, uint32_t slot, CPUState *cpu, int fd, uint64_t sh
     QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
         if(!memcmp(block->idstr, "pc.ram", 6)){
             /* TODO: put assert calls here */ 
-            munmap((void*)(((uint64_t)block->host) + phys_addr), x86_64_PAGE_SIZE);
-            mmap((void*)(((uint64_t)block->host) + phys_addr), 0x1000, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, fd, (i*x86_64_PAGE_SIZE));
+            if (munmap((void*)(((uint64_t)block->host) + phys_addr), x86_64_PAGE_SIZE) == -1) {
+				fprintf(stderr, "%s: munmap failed!\n", __func__);
+				assert(false);
+			}
+            if (mmap((void*)(((uint64_t)block->host) + phys_addr), 0x1000, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, fd, (i*x86_64_PAGE_SIZE)) == MAP_FAILED) {
+				fprintf(stderr, "%s: mmap failed!\n", __func__);
+				assert(false);
+			}
 
             //printf("MMUNMAP: %d\n", munmap((void*)(((uint64_t)block->host) + phys_addr), x86_64_PAGE_SIZE));
             //printf("MMAP: %p\n", mmap((void*)(((uint64_t)block->host) + phys_addr), 0x1000, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, fd, (i*x86_64_PAGE_SIZE)));
@@ -286,6 +292,7 @@ void resize_shared_memory(uint32_t new_size, uint32_t* shm_size, void** shm_ptr,
 
 bool remap_payload_buffer(uint64_t virt_guest_addr, CPUState *cpu){    
     assert(GET_GLOBAL_STATE()->shared_payload_buffer_fd && GET_GLOBAL_STATE()->shared_payload_buffer_size);
+    assert(GET_GLOBAL_STATE()->shared_payload_buffer_size % x86_64_PAGE_SIZE == 0);
     RAMBlock *block;
     refresh_kvm_non_dirty(cpu);
 
diff --git a/nyx/pt.c b/nyx/pt.c
index f90e0de259..80de789ed1 100644
--- a/nyx/pt.c
+++ b/nyx/pt.c
@@ -185,7 +185,7 @@ void pt_dump(CPUState *cpu, int bytes){
 					GET_GLOBAL_STATE()->decoder_page_fault_addr = libxdc_get_page_fault_addr(GET_GLOBAL_STATE()->decoder);
 					break;
 				case decoder_unkown_packet:
-					fprintf(stderr, "WARNING: libxdc_decode returned decoder_error\n");
+					fprintf(stderr, "WARNING: libxdc_decode returned unknown_packet\n");
 					break;
 				case decoder_error:
 					fprintf(stderr, "WARNING: libxdc_decode returned decoder_error\n");