From 578e9ec27d91c4ae2919bf9a12efc0e8990ef084 Mon Sep 17 00:00:00 2001
From: Bartosz Spyrko-Smietanko <bspyrkos@redhat.com>
Date: Thu, 26 Jul 2018 11:13:28 +0100
Subject: [PATCH] [#4379] NPE in ELFlash.get() on first request

---
 .../src/main/java/com/sun/faces/context/flash/ELFlash.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jsf-ri/src/main/java/com/sun/faces/context/flash/ELFlash.java b/jsf-ri/src/main/java/com/sun/faces/context/flash/ELFlash.java
index 175850f6ff..26d4a7f3cc 100644
--- a/jsf-ri/src/main/java/com/sun/faces/context/flash/ELFlash.java
+++ b/jsf-ri/src/main/java/com/sun/faces/context/flash/ELFlash.java
@@ -416,8 +416,9 @@ public Object get(Object key) {
         if (distributable && context.getExternalContext().getSession(false) != null) {
             SessionHelper sessionHelper = 
                     SessionHelper.getInstance(context.getExternalContext());
-            assert(null != sessionHelper);
-            sessionHelper.update(context.getExternalContext(), this);
+            if (sessionHelper != null) {
+              sessionHelper.update(context.getExternalContext(), this);
+            }
         }
 
         if (LOGGER.isLoggable(Level.FINEST)) {