1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 70d7436e1d..ca79dcfc44 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -1986,11 +1986,9 @@ public abstract class AbstractCommunicationManager implements
         // shortly, and we should send the initial UIDL
         boolean sendUIDL = Root.getCurrentRoot() == null;
 
-        // TODO Handle npe if id has not been registered
-        CombinedRequest combinedRequest = application
-                .getCombinedRequest(request);
-
         try {
+            CombinedRequest combinedRequest = new CombinedRequest(request);
+
             Root root = application.getRootForRequest(combinedRequest);
             response.setContentType("application/json; charset=UTF-8");