diff --git a/server-coreless/src/main/java/org/openqa/selenium/server/log/LoggingManager.java b/server-coreless/src/main/java/org/openqa/selenium/server/log/LoggingManager.java
index <HASH>..<HASH> 100644
--- a/server-coreless/src/main/java/org/openqa/selenium/server/log/LoggingManager.java
+++ b/server-coreless/src/main/java/org/openqa/selenium/server/log/LoggingManager.java
@@ -146,7 +146,10 @@ public class LoggingManager {
         }
         for (Handler handler : originalHandlers) {
             logger.addHandler(handler);
-            handler.setFormatter(originalFormatters.get(handler));
+            // jbevan: java.util.logging.Handler.setFormatter(null) throws an NPE
+            if (originalFormatters.get(handler) != null) {
+                handler.setFormatter(originalFormatters.get(handler));
+            }
             handler.setLevel(originalLogLevels.get(handler));
         }
     }
@@ -162,5 +165,4 @@ public class LoggingManager {
         }
     }
 
-    
 }
Added to resolve SRC-<I>.  Checks for null before passing the argument to setFormatter, which throws an NPE on a null argument.  This bug and fix were investigated by Daniel Martin at Google.



r<I>