diff --git a/java/server/src/org/openqa/grid/web/servlet/DisplayHelpServlet.java b/java/server/src/org/openqa/grid/web/servlet/DisplayHelpServlet.java
index 82f6a3714813b..a29546b623294 100644
--- a/java/server/src/org/openqa/grid/web/servlet/DisplayHelpServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/DisplayHelpServlet.java
@@ -143,6 +143,9 @@ private void initServletConfig() {
 
   private String getHelperType() {
     GridRole role = GridRole.get(getInitParameter(HELPER_TYPE_PARAMETER, "standalone"));
+    if (role == null) {
+      role = GridRole.NOT_GRID;
+    }
     String type = "Standalone";
     switch (role) {
       case HUB: {
diff --git a/java/server/src/org/openqa/grid/web/servlet/DriverServlet.java b/java/server/src/org/openqa/grid/web/servlet/DriverServlet.java
index 56ae7e29ba203..329979a0d830d 100644
--- a/java/server/src/org/openqa/grid/web/servlet/DriverServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/DriverServlet.java
@@ -36,7 +36,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -60,19 +59,19 @@ public DriverServlet(GridRegistry registry) {
 
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
   @Override
   protected void doDelete(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
@@ -97,8 +96,10 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
         Map<String, Object> resp = new TreeMap<>();
 
         // https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#error-handling
-        final ExternalSessionKey serverSession = req.getServerSession();
-        resp.put("sessionId", serverSession != null ? serverSession.getKey() : null);
+        if (req != null) {
+          final ExternalSessionKey serverSession = req.getServerSession();
+          resp.put("sessionId", serverSession != null ? serverSession.getKey() : null);
+        }
         resp.put("status", ErrorCodes.UNHANDLED_ERROR);
         Map<String, Object> value = new TreeMap<>();
         value.put("message", e.getMessage());
diff --git a/java/server/src/org/openqa/grid/web/servlet/HubW3CStatusServlet.java b/java/server/src/org/openqa/grid/web/servlet/HubW3CStatusServlet.java
index 9eb8fadbb7f43..2c941b4aa7e8c 100644
--- a/java/server/src/org/openqa/grid/web/servlet/HubW3CStatusServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/HubW3CStatusServlet.java
@@ -35,7 +35,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -54,7 +53,7 @@ public HubW3CStatusServlet(GridRegistry registry) {
 
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
+      throws IOException {
     List<RemoteProxy> allProxies = registry.getAllProxies().getSorted();
     List<RemoteProxy> busyProxies = allProxies.parallelStream()
         .filter(proxy -> proxy.getMaxNumberOfConcurrentTestSessions() - proxy.getTotalUsed() <= 0)
diff --git a/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java b/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java
index ed7d04e07eec8..20dcceb55614e 100644
--- a/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/LifecycleServlet.java
@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,7 +32,7 @@ public class LifecycleServlet extends HttpServlet {
 
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
@@ -44,15 +43,13 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
     response.setStatus(200);
     String action = request.getParameter("action");
     if ("shutdown".equals(action)) {
-      Runnable initiateShutDown = new Runnable() {
-        public void run() {
-          try {
-            Thread.sleep(500);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          }
-          System.exit(0);
+      Runnable initiateShutDown = () -> {
+        try {
+          Thread.sleep(500);
+        } catch (InterruptedException e) {
+          throw new RuntimeException(e);
         }
+        System.exit(0);
       };
       Thread isd = new Thread(initiateShutDown);
       isd.setName("initiateShutDown");
diff --git a/java/server/src/org/openqa/grid/web/servlet/NodeW3CStatusServlet.java b/java/server/src/org/openqa/grid/web/servlet/NodeW3CStatusServlet.java
index 51c6010c39021..e4c8886d79907 100644
--- a/java/server/src/org/openqa/grid/web/servlet/NodeW3CStatusServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/NodeW3CStatusServlet.java
@@ -30,7 +30,6 @@
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -40,7 +39,7 @@ public class NodeW3CStatusServlet extends HttpServlet {
 
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
+      throws IOException {
 
     ImmutableMap.Builder<String, Object> value = ImmutableMap.builder();
 
diff --git a/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java b/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java
index 061ee04cf2138..b3fd877369e31 100644
--- a/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java
@@ -31,7 +31,6 @@
 import org.openqa.selenium.remote.server.ServletRequestWrappingHttpRequest;
 import org.openqa.selenium.remote.server.ServletResponseWrappingHttpResponse;
 
-import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -56,23 +55,20 @@ public ProxyStatusServlet(GridRegistry registry) {
   }
 
   @Override
-  protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws IOException {
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     process(
         new ServletRequestWrappingHttpRequest(request),
         new ServletResponseWrappingHttpResponse(response));
   }
 
   @Override
-  protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws IOException {
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     process(
         new ServletRequestWrappingHttpRequest(request),
         new ServletResponseWrappingHttpResponse(response));
   }
 
-  protected void process(HttpRequest request, HttpResponse response)
-      throws IOException {
+  protected void process(HttpRequest request, HttpResponse response) {
     response.setHeader("Content-Type", MediaType.JSON_UTF_8.toString());
     response.setStatus(200);
     try {
@@ -83,7 +79,7 @@ protected void process(HttpRequest request, HttpResponse response)
     }
   }
 
-  private Map<String, Object> getResponse(HttpRequest request) throws IOException {
+  private Map<String, Object> getResponse(HttpRequest request) {
     Map<String, Object> requestJson = null;
     if (!request.getContentString().isEmpty()) {
       requestJson = json.toType(request.getContentString(), MAP_TYPE);
diff --git a/java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java b/java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java
index 44c47eab7069c..e381f2daa7458 100644
--- a/java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java
@@ -122,7 +122,7 @@ private GridNodeConfiguration mapV2Configuration(Map<String, Object> json) {
     Object servlets = json.get("servlets");
     // V3 beta versions send a V2 RegistrationRequest which specifies servlets as a List<String>
     // When this is the case, we don't need to remove it for parsing.
-    if (servlets != null && servlets instanceof String) {
+    if (servlets instanceof String) {
       json.remove("servlets");
     }
 
@@ -135,7 +135,7 @@ private GridNodeConfiguration mapV2Configuration(Map<String, Object> json) {
         GridNodeConfiguration.loadFromJSON(JSON.toJson(json));
 
     // add the servlets that were saved off
-    if (servlets != null && servlets instanceof String &&
+    if (servlets instanceof String &&
         (pendingConfiguration.servlets == null || pendingConfiguration.servlets.isEmpty())) {
       pendingConfiguration.servlets = Lists.newArrayList(servlets.toString().split(","));
     }
diff --git a/java/server/src/org/openqa/grid/web/servlet/ResourceServlet.java b/java/server/src/org/openqa/grid/web/servlet/ResourceServlet.java
index 3ea04b066b367..be13cd985e156 100644
--- a/java/server/src/org/openqa/grid/web/servlet/ResourceServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/ResourceServlet.java
@@ -24,7 +24,6 @@
 import java.util.Calendar;
 import java.util.Date;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -40,7 +39,7 @@ public class ResourceServlet extends HttpServlet {
 
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
+      throws IOException {
     process(request, response);
   }
 
diff --git a/java/server/src/org/openqa/grid/web/servlet/console/ConsoleServlet.java b/java/server/src/org/openqa/grid/web/servlet/console/ConsoleServlet.java
index 5fa0a27a6f8df..91aa9ba032277 100644
--- a/java/server/src/org/openqa/grid/web/servlet/console/ConsoleServlet.java
+++ b/java/server/src/org/openqa/grid/web/servlet/console/ConsoleServlet.java
@@ -161,11 +161,9 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
     builder.append("</body>");
     builder.append("</html>");
 
-    InputStream in = new ByteArrayInputStream(builder.toString().getBytes("UTF-8"));
-    try {
+    try (InputStream in = new ByteArrayInputStream(builder.toString().getBytes("UTF-8"))) {
       ByteStreams.copy(in, response.getOutputStream());
     } finally {
-      in.close();
       response.getOutputStream().close();
     }
   }
@@ -198,7 +196,6 @@ private Object getHeader() {
     builder.append("</h2>");
     builder.append("<div><a id='helplink' target='_blank' href='https://github.com/SeleniumHQ/selenium/wiki/Grid2'>Help</a></div>");
     builder.append("</div>");
-    builder.append("");
     return builder.toString();
   }
 
diff --git a/java/server/src/org/openqa/grid/web/servlet/console/DefaultProxyHtmlRenderer.java b/java/server/src/org/openqa/grid/web/servlet/console/DefaultProxyHtmlRenderer.java
index 51918d0da3af0..94bef79e966f4 100644
--- a/java/server/src/org/openqa/grid/web/servlet/console/DefaultProxyHtmlRenderer.java
+++ b/java/server/src/org/openqa/grid/web/servlet/console/DefaultProxyHtmlRenderer.java
@@ -55,7 +55,7 @@ public String renderSummary() {
 
     builder.append("<p class='proxyid'>id : ");
     builder.append(proxy.getId());
-    builder.append(", OS : " + platform + "</p>");
+    builder.append(", OS : ").append(platform).append("</p>");
 
     builder.append(nodeTabs());
 
@@ -129,7 +129,7 @@ private String getLines(SlotsLines lines) {
       String version = cap.getVersion();
       builder.append("<p>");
       if (version != null) {
-        builder.append("v:" + version);
+        builder.append("v:").append(version);
       }
       for (TestSlot s : lines.getLine(cap)) {
         builder.append(getSingleSlotHtml(s, icon));
@@ -188,11 +188,10 @@ private String nodeTabs() {
    * @return Either the platform name, "Unknown", "mixed OS", or "not specified".
    */
   public static String getPlatform(RemoteProxy proxy) {
-    Platform res = null;
     if (proxy.getTestSlots().size() == 0) {
       return "Unknown";
     }
-    res = getPlatform(proxy.getTestSlots().get(0));
+    Platform res = getPlatform(proxy.getTestSlots().get(0));
 
     for (TestSlot slot : proxy.getTestSlots()) {
       Platform tmp = getPlatform(slot);