diff --git a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
index 21d4960..e026771 100644
--- a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
+++ b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
@@ -185,6 +185,12 @@
       // if we can map the request to a module's servlet.
       RequestParts parts = new RequestParts(request);
 
+      if ("favicon.ico".equalsIgnoreCase(parts.moduleName)) {
+        sendErrorResponse(response, HttpServletResponse.SC_NOT_FOUND,
+            "Icon not available");
+        return;
+      }
+
       // See if the request references a module we know.
       moduleDef = getModuleDef(logger, parts.moduleName);
       if (moduleDef != null) {
@@ -304,12 +310,6 @@
       HttpServletResponse response, TreeLogger logger, RequestParts parts)
       throws IOException {
 
-    if ("favicon.ico".equalsIgnoreCase(parts.moduleName)) {
-      sendErrorResponse(response, HttpServletResponse.SC_NOT_FOUND,
-          "Icon not available");
-      return;
-    }
-
     // Generate a generic empty host page.
     //
     String msg = "The development shell servlet received a request to generate a host page for module '"