Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision 2e311daf8cae0e3b930fd0f490e13611dd9eaa77)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision 180e132e384843a8eabdd40e2084dcb37e1e2542)
@@ -484,7 +484,7 @@
 	pte_t t;
 
+	assert(istate_from_uspace(istate));
+
 	va = istate->cr_ifa; /* faulting address */
-
-	assert(!is_kernel_fault(va));
 
 	bool found = page_mapping_find(AS, va, true, &t);
@@ -680,7 +680,7 @@
 	pte_t t;
 
+	assert(istate_from_uspace(istate));
+
 	va = istate->cr_ifa;  /* faulting address */
-
-	assert(!is_kernel_fault(va));
 
 	bool found = page_mapping_find(AS, va, true, &t);
@@ -752,7 +752,7 @@
 	pte_t t;
 
+	assert(istate_from_uspace(istate));
+
 	va = istate->cr_ifa;  /* faulting address */
-
-	assert(!is_kernel_fault(va));
 
 	/*
@@ -779,7 +779,7 @@
 	pte_t t;
 
+	assert(istate_from_uspace(istate));
+
 	va = istate->cr_ifa;  /* faulting address */
-
-	assert(!is_kernel_fault(va));
 
 	bool found = page_mapping_find(AS, va, true, &t);