1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 405ae8da93..93b98693c2 100644
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -30,7 +30,6 @@ import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.WrappedRequest.BrowserDetails;
-import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
 import com.vaadin.terminal.gwt.client.ui.root.RootServerRpc;
@@ -475,10 +474,10 @@ public abstract class Root extends AbstractComponentContainer implements
     }
 
     @Override
-    protected ComponentState createState() {
+    public Class<? extends RootState> getStateType() {
         // This is a workaround for a problem with creating the correct state
         // object during build
-        return new RootState();
+        return RootState.class;
     }
 
     /**
@@ -644,6 +643,10 @@ public abstract class Root extends AbstractComponentContainer implements
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     public Iterator<Component> getComponentIterator() {
+        if (getContent() == null) {
+            return Collections.EMPTY_LIST.iterator();
+        }
+
         return Collections.singleton((Component) getContent()).iterator();
     }