From 21751351065ed7d52152b9359a208a0ce1f3bb92 Mon Sep 17 00:00:00 2001
From: Joe Barnes <joe@joescii.com>
Date: Mon, 11 Dec 2017 17:32:15 -0600
Subject: [PATCH] Adding a null guard to prevent alarming yet harmless
 NullPointerException messages in the appserver log. Resolves #1929

---
 web/webkit/src/main/scala/net/liftweb/http/SessionMaster.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/webkit/src/main/scala/net/liftweb/http/SessionMaster.scala b/web/webkit/src/main/scala/net/liftweb/http/SessionMaster.scala
index 8af0f4855e..d48e62a741 100644
--- a/web/webkit/src/main/scala/net/liftweb/http/SessionMaster.scala
+++ b/web/webkit/src/main/scala/net/liftweb/http/SessionMaster.scala
@@ -199,7 +199,7 @@ object SessionMaster extends LiftActor with Loggable {
   def isDead(sessionId: String): Boolean = killedSessions.containsKey(sessionId)
 
   private val reaction: PartialFunction[Any, Unit] = {
-    case RemoveSession(sessionId) =>
+    case RemoveSession(sessionId) if sessionId != null =>
 
       val ses = lockRead(nsessions)
       (Box !! ses.get(sessionId)).foreach {