Index: generic/src/interrupt/interrupt.c
===================================================================
--- generic/src/interrupt/interrupt.c	(revision 874621f88e11575154ad0c2e08fc906a8d92e4c0)
+++ generic/src/interrupt/interrupt.c	(revision 4ddeace5764cff68ff26f294be7ead55e4d70796)
@@ -86,4 +86,7 @@
 	
 	exc_table[n].f(n + IVT_FIRST, istate);
+	/* This is a safe place to exit exiting thread */
+	if (THREAD && THREAD->interrupted && istate_from_uspace(istate))
+		thread_exit();
 }