Index: kernel/generic/src/interrupt/interrupt.c
===================================================================
--- kernel/generic/src/interrupt/interrupt.c	(revision c70d69396cf4224472cf29bb60d6f726a757c076)
+++ kernel/generic/src/interrupt/interrupt.c	(revision b9e7944055fbefcc560af681ef9fafaffaeaba03)
@@ -87,6 +87,15 @@
 {
 	ASSERT(n < IVT_ITEMS);
+
+#ifdef CONFIG_UDEBUG
+	if (THREAD) THREAD->udebug.uspace_state = istate;
+#endif
 	
 	exc_table[n].f(n + IVT_FIRST, istate);
+
+#ifdef CONFIG_UDEBUG
+	if (THREAD) THREAD->udebug.uspace_state = NULL;
+#endif
+
 	/* This is a safe place to exit exiting thread */
 	if (THREAD && THREAD->interrupted && istate_from_uspace(istate))