diff --git a/source/net/yacy/cora/protocol/HeaderFramework.java b/source/net/yacy/cora/protocol/HeaderFramework.java
index 26fcfd540..415eb4937 100644
--- a/source/net/yacy/cora/protocol/HeaderFramework.java
+++ b/source/net/yacy/cora/protocol/HeaderFramework.java
@@ -195,7 +195,7 @@ public class HeaderFramework extends TreeMap<String, String> implements Map<Stri
     public static final String CONNECTION_PROP_METHOD = "METHOD";
     public static final String CONNECTION_PROP_PATH = "PATH";
     public static final String CONNECTION_PROP_EXT = "EXT";
-    public static final String CONNECTION_PROP_ARGS = "ARGS";
+    // public static final String CONNECTION_PROP_ARGS = "ARGS"; // use getQueryString() or getParameter()
     public static final String CONNECTION_PROP_CLIENTIP = "CLIENTIP";
     public static final String CONNECTION_PROP_PERSISTENT = "PERSISTENT";
     public static final String CONNECTION_PROP_REQUEST_START = "REQUEST_START";
diff --git a/source/net/yacy/cora/protocol/RequestHeader.java b/source/net/yacy/cora/protocol/RequestHeader.java
index e50f30312..9d55d2d1b 100644
--- a/source/net/yacy/cora/protocol/RequestHeader.java
+++ b/source/net/yacy/cora/protocol/RequestHeader.java
@@ -324,8 +324,7 @@ public class RequestHeader extends HeaderFramework implements HttpServletRequest
         if (_request != null) {
             return _request.getQueryString();
         } else {
-            // in case of discoraged use of arbitrary header prop
-            return super.get(HeaderFramework.CONNECTION_PROP_ARGS);
+            return null;
         }
     }
 
@@ -710,16 +709,18 @@ public class RequestHeader extends HeaderFramework implements HttpServletRequest
     public void setAttribute(String name, Object o) {
         if (_request != null) {
             _request.setAttribute(name, o);
+        } else {
+            throw new UnsupportedOperationException("Not supported yet.");
         }
-        throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
     public void removeAttribute(String name) {
         if (_request != null) {
             _request.removeAttribute(name);
+        } else {
+            throw new UnsupportedOperationException("Not supported yet.");
         }
-        throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override