From ef43db6e1d8dd0e9717642844ffd79da7dd4ef39 Mon Sep 17 00:00:00 2001
From: Alexei Barantsev <barancev@gmail.com>
Date: Sun, 5 Apr 2020 11:51:06 +0300
Subject: [PATCH] [java] Preventing possible NullPointerException

---
 .../grid/node/config/DriverServiceSessionFactory.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/server/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java b/java/server/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java
index fb28a1cfcf6f2..6d199d6b4cef4 100644
--- a/java/server/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java
+++ b/java/server/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java
@@ -103,7 +103,9 @@ public void stop() {
             }
           });
     } catch (Exception e) {
-      service.stop();
+      if (service != null) {
+        service.stop();
+      }
       return Optional.empty();
     }