1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 7d88b432f4..f61f40dccc 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -436,11 +436,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
 
             /* Handle the request */
             if (requestType == RequestType.FILE_UPLOAD) {
-                Root root = application.getRootForRequest(request);
-                if (root == null) {
-                    throw new ServletException(ERROR_NO_ROOT_FOUND);
-                }
-                applicationManager.handleFileUpload(root, request, response);
+                // Root is resolved in communication manager
+                applicationManager.handleFileUpload(application, request,
+                        response);
                 return;
             } else if (requestType == RequestType.UIDL) {
                 Root root = application.getRootForRequest(request);