From dc540c795ac80df4ade4bd98ae086605335ed4f1 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Fri, 9 Nov 2018 18:19:59 +0100
Subject: [PATCH] Avoid NPE in SessionState.X.merge

---
 src/main/java/ctbrec/sites/mfc/X.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ctbrec/sites/mfc/X.java b/src/main/java/ctbrec/sites/mfc/X.java
index db5175db..8b0b99ee 100644
--- a/src/main/java/ctbrec/sites/mfc/X.java
+++ b/src/main/java/ctbrec/sites/mfc/X.java
@@ -37,8 +37,12 @@ public class X {
         if(x == null) {
             return;
         }
-        fcext.merge(x.fcext);
-        share.merge(x.share);
+        if (fcext != null) {
+            fcext.merge(x.fcext);
+        }
+        if (share != null) {
+            share.merge(x.share);
+        }
         additionalProperties.putAll(x.additionalProperties);
 
     }