--- a/AbstractLauncherApplication.st	Wed Jul 20 11:36:25 2016 +0200
+++ b/AbstractLauncherApplication.st	Wed Jul 20 16:18:35 2016 +0200
@@ -876,6 +876,10 @@
     box action:[:selection |
         |v|
 
+        box selectionIndex isNil ifTrue:[
+            ^ nil.
+        ].
+
         v := (knownTopViewsAndLabels at:box selectionIndex) value.
         box destroy.
         ^ v
@@ -2399,7 +2403,7 @@
 migrateWindow:aWindow
     "migrate a view to some other display"
 
-    aWindow windowGroup isModal ifTrue:[
+    aWindow isModal ifTrue:[
         self warn:'Sorry - I cannot migrate a modalBox; please migrate the owning View.'.
         ^ self
     ].