diff --git a/src/main/java/org/mcstats/handler/ReportHandler.java b/src/main/java/org/mcstats/handler/ReportHandler.java
index c4665e1..a72c491 100755
--- a/src/main/java/org/mcstats/handler/ReportHandler.java
+++ b/src/main/java/org/mcstats/handler/ReportHandler.java
@@ -167,7 +167,8 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
                 headers.put(headerName, request.getHeader(headerName));
             }
 
-            String pluginName = URLUtils.decode(getPluginName(request));
+            String rawName = getPluginName(request);
+            String pluginName = rawName == null ? null : URLUtils.decode(rawName);
 
             if (pluginName == null) {
                 finishRequest(null, ResponseType.ERROR, "Invalid arguments.", baseRequest, response);
@@ -498,6 +499,8 @@ private String getPluginName(HttpServletRequest request) {
         String url = request.getRequestURI();
         if (url.startsWith("//report/")) {
             return url.substring("//report/".length());
+        } else if (url.startsWith("//plugin/")) {
+            return url.substring("//plugin/".length());
         } else if (url.startsWith("/report/")) {
             return url.substring("/report/".length());
         } else if (url.startsWith("/plugin/")) {