--- a/Notification.st	Fri Jan 21 18:03:47 2005 +0100
+++ b/Notification.st	Fri Jan 21 18:10:30 2005 +0100
@@ -219,15 +219,18 @@
 
     con := Context findFirstSpecialHandle:true raise:false.
     [con notNil] whileTrue:[
-        (con selector == #answer:do:) ifFalse:[
+        (con selector ~~ #answer:do:) ifTrue:[
             ^ super raiseRequest
         ].
         signal := con receiver.
         signal == self ifTrue:[
             ^ con argAt:1
         ].
+        signal isNil ifTrue:[
+            self error:'nil receiver in #answer:do: - send'.
+        ].
         (signal accepts:self) ifTrue:[
-            ^ super raiseRequest
+            ^ con argAt:1
         ].
         con := con findSpecialHandle:true raise:false.
     ].
@@ -285,7 +288,7 @@
 !Notification class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Notification.st,v 1.15 2005-01-21 10:24:24 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Notification.st,v 1.16 2005-01-21 17:10:30 stefan Exp $'
 ! !
 
 Notification initialize!