--- a/ApplicationModel.st	Tue Feb 28 12:47:54 2017 +0100
+++ b/ApplicationModel.st	Fri Mar 03 13:43:57 2017 +0100
@@ -3845,27 +3845,27 @@
     self release.
     ActiveHelp stopFor:self.
 
-    window := self window.
-
     self shouldRememberLastExtent ifTrue:[
         self rememberLastExtent.
     ].
-    ((wg := self windowGroup) notNil
-    and:[ wg isModal not ]) ifTrue:[
+    wg := self windowGroup.
+    (wg notNil and:[wg isModal not]) ifTrue:[
         wgProcess := wg process.
-        (Processor activeProcess ~~ wgProcess
-        and:[wgProcess notNil]) ifTrue:[
+        (wgProcess notNil and:[Processor activeProcess ~~ wgProcess]) ifTrue:[
             wgProcess terminate
         ] ifFalse:[
             wg closeDownViews.
-        ]
-    ] ifFalse:[
-        window notNil ifTrue:[
-            window destroy.
-        ]
+        ].
+        ^ self.
+    ].
+
+    window := self window.
+    window notNil ifTrue:[
+        window destroy.
     ].
 
     "Modified: / 08-02-2017 / 00:24:14 / cg"
+    "Modified: / 03-03-2017 / 12:00:22 / stefan"
 !
 
 closeRequest