--- a/Context.st	Tue Aug 20 11:51:38 2013 +0200
+++ b/Context.st	Tue Aug 20 12:19:12 2013 +0200
@@ -1256,11 +1256,12 @@
          If such a context is restarted, a runtime error is raised."
 
 %{  /* NOCONTEXT */
-    if (__INST(sender_) != nil) {
+    if (__INST(sender_) == nil) {
+        RETURN(nil);
+    } else {
         __RESUMECONTEXT__(self, value, 0);
     }
 %}.
-    self sender isNil ifTrue:[^ nil].
 
     "
      when we arrive here, something went wrong.
@@ -1286,11 +1287,12 @@
          If such a context is restarted, a runtime error is raised."
 
 %{
-    if (__INST(sender_) != nil) {
+    if (__INST(sender_) == nil) {
+        RETURN(nil);
+    } else {
         __RESUMECONTEXT__(self, aBlock, 2);
     }
 %}.
-    self sender isNil ifTrue:[^ nil].
 
     "
      when we arrive here, something went wrong.
@@ -2496,11 +2498,11 @@
 !Context class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.188 2013-08-20 09:51:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.189 2013-08-20 10:19:12 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.188 2013-08-20 09:51:38 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.189 2013-08-20 10:19:12 stefan Exp $'
 !
 
 version_HG