Index: generic/src/interrupt/interrupt.c
===================================================================
--- generic/src/interrupt/interrupt.c	(revision 874621f88e11575154ad0c2e08fc906a8d92e4c0)
+++ generic/src/interrupt/interrupt.c	(revision 9b6aae6df3dca26496d6ac75535ffe1230e715c1)
@@ -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();
 }