--- a/JavaContext.st	Tue Oct 08 19:16:39 2013 +0100
+++ b/JavaContext.st	Thu Oct 10 00:08:11 2013 +0100
@@ -670,15 +670,18 @@
     JavaVM releaseMonitorsOfUnwindingContext: context.
 
     selector == #return ifTrue:[
-        exception return
+        thisContext evaluateUnwindActionsUpTo:context.    
+        context return
     ].
     selector == #return: ifTrue:[
-        exception return: value
+        thisContext evaluateUnwindActionsUpTo:context.    
+        context return: value
     ].
 
     self error:'Should never be reached'.
 
     "Created: / 04-04-2012 / 20:24:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-10-2013 / 01:40:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaContext class methodsFor:'documentation'!