From 4114a07cd844bfd24f97588376a0e0466333c4a4 Mon Sep 17 00:00:00 2001
From: Alexei Barantsev <barancev@gmail.com>
Date: Sun, 5 Oct 2014 20:22:21 +0400
Subject: [PATCH] Fixing SessionId from json converter to better handle the
 case of null sessionId

---
 .../src/org/openqa/selenium/remote/JsonToBeanConverter.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java b/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java
index ccf743fde1dca..fd920ba491e2b 100644
--- a/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java
+++ b/java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java
@@ -95,7 +95,7 @@ private <T> T convert(Class<T> clazz, Object text, int depth) {
       JsonObject json = new JsonParser().parse((String) text).getAsJsonObject();
 
       SessionId sessionId = null;
-      if (json.has("sessionId")) {
+      if (json.has("sessionId") && !json.get("sessionId").isJsonNull()) {
         sessionId = convert(SessionId.class, json.get("sessionId"), depth + 1);
       }