--- a/Block.st	Tue Mar 17 17:21:53 2009 +0100
+++ b/Block.st	Tue Mar 17 17:22:03 2009 +0100
@@ -542,7 +542,6 @@
     "Created: 15.11.1996 / 11:38:37 / cg"
 ! !
 
-
 !Block methodsFor:'accessing'!
 
 home
@@ -2030,7 +2029,7 @@
         ].
         (exceptionHandlerInContext == exceptionHandler 
          or:[exceptionHandlerInContext accepts:exceptionHandler]) ifTrue:[
-            ^ theContext argAt:2.
+            ^ (theContext argAt:2) ? [nil].
         ].
         ^ nil
     ].
@@ -2053,7 +2052,7 @@
         ].
         (exceptionHandlerInContext == exceptionHandler 
          or:[exceptionHandlerInContext accepts:exceptionHandler]) ifTrue:[
-            ^ theContext argAt:2.
+            ^ (theContext argAt:2) ? [nil].
         ].
 
         exceptionHandlerInContext := theContext argAt:3.
@@ -2073,7 +2072,7 @@
         ].
         (exceptionHandlerInContext == exceptionHandler 
          or:[exceptionHandlerInContext accepts:exceptionHandler]) ifTrue:[
-            ^ theContext argAt:4.
+            ^ (theContext argAt:4) ? [nil].
         ].
         ^ nil
     ].
@@ -2820,7 +2819,7 @@
 !Block class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.163 2009-02-28 02:28:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Block.st,v 1.164 2009-03-17 16:22:03 stefan Exp $'
 ! !
 
 Block initialize!