diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java
index c0566cc1..bd045b95 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java
@@ -337,12 +337,12 @@ public abstract class NanoHTTPD
      */
     protected String decodePercent(String str)
     {
-        String decoded = null;
+        String decoded = str;
         try
         {
             decoded = URLDecoder.decode(str, "UTF8");
         }
-        catch (UnsupportedEncodingException ignored)
+        catch (UnsupportedEncodingException | IllegalArgumentException ignored)
         {
         }
         return decoded;