1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
index 1befd1d..aa86873 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
@@ -138,6 +138,11 @@ public class ConfigUtil {
     }
 
     private ClientType merge(ClientType primary, ClientType fallback) {
+
+        if (fallback == null) {
+            return primary;
+        }
+
         var builder = clientTypeBuilder(fallback);
 
         if (primary.getURL() != null) {
@@ -152,6 +157,11 @@ public class ConfigUtil {
     }
 
     private SSLType merge(SSLType primary, SSLType fallback) {
+
+        if (fallback == null) {
+            return primary;
+        }
+
         var builder = SSLTypeBuilder(fallback);
 
         if (primary.getKeyStore() != null) {