Window.close shouldn't throw npe even if not attached to any root

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index f9e22697ce..037bb64873 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -296,10 +296,14 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier {
      */
     public void close() {
         Root root = getRoot();
-        // focus is restored to the parent window
-        root.focus();
-        // subwindow is removed from the root
-        root.removeWindow(this);
+
+        // Don't do anything if not attached to a root
+        if (root != null) {
+            // focus is restored to the parent window
+            root.focus();
+            // subwindow is removed from the root
+            root.removeWindow(this);
+        }
     }
 
     /**