diff --git a/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java b/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java
index <HASH>..<HASH> 100644
--- a/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java
+++ b/trunk/JLanguageTool/src/java/de/danielnaber/languagetool/server/HTTPServer.java
@@ -208,6 +208,8 @@ public class HTTPServer extends ContentOracle {
    * @throws UnsupportedEncodingException If character encoding needs to be consulted, but named character encoding is not supported
    */
   private Map<String, String> getParamMap(Request connRequest) throws UnsupportedEncodingException {
+    if ((null == connRequest) || (null == connRequest.getParamString()))
+      return new HashMap<String, String>();
     Map<String, String> paramMap = new HashMap<String, String>();
       String[] comps = connRequest.getParamString().split("&");
       for (int i = 0; i < comps.length; i++) {
Added some tests to validate request string.