--- a/GenericException.st	Tue Mar 17 17:22:10 2009 +0100
+++ b/GenericException.st	Tue Mar 17 17:22:19 2009 +0100
@@ -452,7 +452,7 @@
     (theContext selector ~~ #'handle:from:do:'
      or:[(theContext argAt:2) == originator]) ifTrue:[
         (self == signal or:[self accepts:signal]) ifTrue:[
-            ^ theContext argAt:1
+            ^ (theContext argAt:1) ? [nil]
         ]
     ].
 
@@ -1786,10 +1786,10 @@
     |val|
 
     aHandlerBlock argumentCount == 0 ifTrue:[
-        "/ 0-arg handler - not interested in the ex - object
+        "0-arg handler or any object - not interested in the exception argument"
         val := aHandlerBlock value
     ] ifFalse:[
-        "/ 1-arg handler - pass myself as exception argument
+        "1-arg handler - pass myself as exception argument"
         val := aHandlerBlock value:self.
     ].
 
@@ -2048,7 +2048,7 @@
 !GenericException class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.114 2009-03-06 19:00:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.115 2009-03-17 16:22:19 stefan Exp $'
 ! !
 
 GenericException initialize!