diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java
index 9ee7b956c..f2946e2f0 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java
+++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java
@@ -1,59 +1,62 @@
-package com.gempukku.lotro.async.handler;
-
-import com.gempukku.lotro.async.HttpProcessingException;
-import com.gempukku.lotro.async.ResponseWriter;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.IF_NONE_MATCH;
-
-import org.jboss.netty.handler.codec.http.HttpRequest;
-
-import java.io.File;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
-
-public class WebRequestHandler implements UriRequestHandler {
-    private String _root;
-    private String _uniqueEtag;
-
-    public WebRequestHandler(String root) {
-        _root = root;
-        _uniqueEtag = "\"" + String.valueOf(System.currentTimeMillis()) + "\"";
-    }
-
-    @Override
-    public void handleRequest(String uri, HttpRequest request, Map<Type, Object> context, ResponseWriter responseWriter, MessageEvent e) throws Exception {
-        if (clientHasCurrentVersion(request))
-            throw new HttpProcessingException(304);
-
-        if (uri.equals(""))
-            uri = "index.html";
-
-        uri = uri.replace('/', File.separatorChar);
-
-        if ((uri.contains(".."))
-                || uri.contains(File.separator + ".")
-                || uri.startsWith(".") || uri.endsWith("."))
-            throw new HttpProcessingException(403);
-
-        File file = new File(_root + uri);
-        if (!file.getCanonicalPath().startsWith(_root))
-            throw new HttpProcessingException(403);
-
-        responseWriter.writeFile(file, Collections.singletonMap(HttpHeaders.Names.ETAG, _uniqueEtag));
-    }
-
-    private boolean clientHasCurrentVersion(HttpRequest request) {
-        String ifNoneMatch = request.getHeader(IF_NONE_MATCH);
-        if (ifNoneMatch != null) {
-            String[] clientKnownVersions = ifNoneMatch.split(",");
-            for (String clientKnownVersion : clientKnownVersions) {
-                if (clientKnownVersion.trim().equals(_uniqueEtag))
-                    return true;
-            }
-        }
-        return false;
-    }
-}
+package com.gempukku.lotro.async.handler;
+
+import com.gempukku.lotro.async.HttpProcessingException;
+import com.gempukku.lotro.async.ResponseWriter;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.handler.codec.http.HttpHeaders;
+
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.IF_NONE_MATCH;
+
+import org.jboss.netty.handler.codec.http.HttpRequest;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Map;
+
+public class WebRequestHandler implements UriRequestHandler {
+    private String _root;
+
+    public WebRequestHandler(String root) {
+        _root = root;
+    }
+
+    @Override
+    public void handleRequest(String uri, HttpRequest request, Map<Type, Object> context, ResponseWriter responseWriter, MessageEvent e) throws Exception {
+        if (uri.equals(""))
+            uri = "index.html";
+
+        uri = uri.replace('/', File.separatorChar);
+
+        if ((uri.contains(".."))
+                || uri.contains(File.separator + ".")
+                || uri.startsWith(".") || uri.endsWith("."))
+            throw new HttpProcessingException(403);
+
+        File file = new File(_root + uri);
+        if (!file.getCanonicalPath().startsWith(_root))
+            throw new HttpProcessingException(403);
+
+        if (!file.exists())
+            throw new HttpProcessingException(404);
+
+        final String etag = "\""+file.lastModified()+"\"";
+
+        if (clientHasCurrentVersion(request, etag))
+            throw new HttpProcessingException(304);
+
+        responseWriter.writeFile(file, Collections.singletonMap(HttpHeaders.Names.ETAG, etag));
+    }
+
+    private boolean clientHasCurrentVersion(HttpRequest request, String etag) {
+        String ifNoneMatch = request.getHeader(IF_NONE_MATCH);
+        if (ifNoneMatch != null) {
+            String[] clientKnownVersions = ifNoneMatch.split(",");
+            for (String clientKnownVersion : clientKnownVersions) {
+                if (clientKnownVersion.trim().equals(etag))
+                    return true;
+            }
+        }
+        return false;
+    }
+}