diff --git a/java/server/src/org/openqa/grid/internal/TestSession.java b/java/server/src/org/openqa/grid/internal/TestSession.java
index <HASH>..<HASH> 100644
--- a/java/server/src/org/openqa/grid/internal/TestSession.java
+++ b/java/server/src/org/openqa/grid/internal/TestSession.java
@@ -329,7 +329,10 @@ public class TestSession {
                                       + pathSpec);
     }
     String end = path.substring(pathSpec.length());
-    String ok = remoteURL + end + "?" + request.getQueryString();
+    String ok = remoteURL + end;
+    if (request.getQueryString() != null) {
+      ok += "?" + request.getQueryString();
+    }
     String uri = new URL(remoteURL, ok).toExternalForm();
 
     InputStream body = null;
only append query string if it exists (avoid getting "?null" on all forwarded requests)