Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision abf6c018de8e29f417e189c669b1514cb9a75462)
+++ kernel/generic/src/mm/as.c	(revision 5071f8a8d049c5ec42cf8d3640c718d3cf19c5a6)
@@ -1465,9 +1465,9 @@
 
 page_fault:
-	if (THREAD->in_copy_from_uspace) {
+	if (THREAD && THREAD->in_copy_from_uspace) {
 		THREAD->in_copy_from_uspace = false;
 		istate_set_retaddr(istate,
 		    (uintptr_t) &memcpy_from_uspace_failover_address);
-	} else if (THREAD->in_copy_to_uspace) {
+	} else if (THREAD && THREAD->in_copy_to_uspace) {
 		THREAD->in_copy_to_uspace = false;
 		istate_set_retaddr(istate,