1 files changed, 6 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/VUI.java b/client/src/com/vaadin/client/ui/VUI.java
index 577af47aae..688c60bca1 100644
--- a/client/src/com/vaadin/client/ui/VUI.java
+++ b/client/src/com/vaadin/client/ui/VUI.java
@@ -238,6 +238,12 @@ public class VUI extends SimplePanel implements ResizeHandler,
     @Deprecated
     protected void windowSizeMaybeChanged(int newWindowWidth,
             int newWindowHeight) {
+        if (connection == null) {
+            // Connection is null if the timer fires before the first UIDL
+            // update
+            return;
+        }
+
         boolean changed = false;
         ComponentConnector connector = ConnectorMap.get(connection)
                 .getConnector(this);