diff --git a/repos/base-nova/src/core/pager.cc b/repos/base-nova/src/core/pager.cc
index b7be28fea..36f76bb5d 100644
--- a/repos/base-nova/src/core/pager.cc
+++ b/repos/base-nova/src/core/pager.cc
@@ -398,10 +398,6 @@ void Pager_object::cleanup_call()
 	/* revoke all portals handling the client. */
 	revoke(Obj_crd(exc_pt_sel_client(), NUM_INITIAL_PT_LOG2));
 
-	/* if we are paused or waiting for a page fault nothing is in-flight */
-	if (_state.blocked())
-		return;
-
 	Utcb *utcb = reinterpret_cast<Utcb *>(Thread_base::myself()->utcb());
 	utcb->set_msg_word(0);
 	utcb->mtd = 0;
diff --git a/repos/base-nova/src/core/platform.cc b/repos/base-nova/src/core/platform.cc
index f7a11f088..b1a4ff02d 100644
--- a/repos/base-nova/src/core/platform.cc
+++ b/repos/base-nova/src/core/platform.cc
@@ -118,6 +118,46 @@ static void page_fault_handler()
 	print_page_fault("\nPAGE-FAULT IN CORE", pf_addr, pf_ip,
 	                 (pf_type & Ipc_pager::ERR_W) ? Rm_session::WRITE_FAULT : Rm_session::READ_FAULT, 0);
 
+	printf("\nstack pointer 0x%lx, qualifiers 0x%lx %s%s%s%s%s\n",
+	       pf_sp, pf_type,
+	       pf_type & Ipc_pager::ERR_I ? "I" : "i",
+	       pf_type & Ipc_pager::ERR_R ? "R" : "r",
+	       pf_type & Ipc_pager::ERR_U ? "U" : "u",
+	       pf_type & Ipc_pager::ERR_W ? "W" : "w",
+	       pf_type & Ipc_pager::ERR_P ? "P" : "p");
+
+	if ((Native_config::context_area_virtual_base() <= pf_sp) &&
+		(pf_sp < Native_config::context_area_virtual_base() +
+		         Native_config::context_area_virtual_size()))
+	{
+		addr_t utcb_addr_f  = pf_sp / Native_config::context_virtual_size();
+		utcb_addr_f        *= Native_config::context_virtual_size();
+		utcb_addr_f        += Native_config::context_virtual_size();
+		utcb_addr_f        -= 4096;
+
+		Nova::Utcb * utcb_fault = reinterpret_cast<Nova::Utcb *>(utcb_addr_f);
+		unsigned last_items = utcb_fault->msg_items();
+
+		printf("faulter utcb %p, last message item count %u\n",
+		       utcb_fault, last_items);
+
+		for (unsigned i = 0; i < last_items; i++) {
+			Nova::Utcb::Item * item = utcb_fault->get_item(i);
+			if (!item)
+				break;
+
+			Nova::Crd crd(item->crd);
+			if (crd.is_null())
+				continue;
+
+			printf("%u - type=%x rights=0x%x region=0x%lx+0x%lx "
+			       "hotspot %lx(%lx) - %s\n", i, crd.type(), crd.rights(),
+			       crd.addr(), 1UL << (12 +crd.order()),
+			       crd.hotspot(item->hotspot), item->hotspot,
+			       item->is_del() ? "delegated" : "translated");
+		}
+	}
+
 	/* dump stack trace */
 	struct Core_img
 	{