Index: kernel/arch/ia32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia32/src/proc/scheduler.c	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/arch/ia32/src/proc/scheduler.c	(revision 7bb0c321ab9bf6b85b9e96d07f8afca9e9c5bb9a)
@@ -67,8 +67,9 @@
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT
 	/* Set watchpoint on AS to ensure that nobody sets it to zero */
-	if (CPU->id < BKPOINTS_MAX)
-		breakpoint_add(&((the_t *) THREAD->kstack)->as, 
-			       BKPOINT_WRITE | BKPOINT_CHECK_ZERO,
-			       CPU->id);
+	if (CPU->id < BKPOINTS_MAX) {
+		the_t *the = THE;
+		breakpoint_add(&((the_t *) the->thread->kstack)->as, 
+			BKPOINT_WRITE | BKPOINT_CHECK_ZERO, the->cpu->id);
+	}
 #endif
 }