diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
index d9aab245f0..05990e9657 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
@@ -205,6 +205,10 @@ public abstract class ResourceServlet extends HttpServlet {
   Resource getResource(String name) {
     try {
       Path p = getResourcePath(name);
+      if (p == null) {
+        log.warn(String.format("Path doesn't exist %s", name));
+        return null;
+      }
       return cache.get(p, newLoader(p));
     } catch (ExecutionException | IOException e) {
       log.warn(String.format("Cannot load static resource %s", name), e);