From 620d30f01fd1e0b76ff63aed9349824c58fd0b71 Mon Sep 17 00:00:00 2001
From: Philipp Haupt <phaupt@users.noreply.github.com>
Date: Wed, 4 Jun 2025 08:40:52 +0200
Subject: [PATCH] Fix null cause handling when closing protocol handler

---
 .../mid/client/impl/MIDClientImpl.java        | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/mid-java-client-core/src/main/java/ch/swisscom/mid/client/impl/MIDClientImpl.java b/mid-java-client-core/src/main/java/ch/swisscom/mid/client/impl/MIDClientImpl.java
index 2e3835e..7677a53 100644
--- a/mid-java-client-core/src/main/java/ch/swisscom/mid/client/impl/MIDClientImpl.java
+++ b/mid-java-client-core/src/main/java/ch/swisscom/mid/client/impl/MIDClientImpl.java
@@ -93,15 +93,22 @@ public void close() {
         if (selectedProtocolHandler != null) {
             try {
                 selectedProtocolHandler.close();
-            } catch (Exception e) {
-                logClient.debug("ComProtocolHandler failed to close: {}: {}, cause: {}: {}",
-                                e.getClass().getSimpleName(),
-                                e.getLocalizedMessage(),
-                                e.getCause().getClass(),
-                                e.getCause().getLocalizedMessage());
-            }
-        }
-    }
+            } catch (Exception e) {
+                Throwable cause = e.getCause();
+                if (cause != null) {
+                    logClient.debug("ComProtocolHandler failed to close: {}: {}, cause: {}: {}",
+                                    e.getClass().getSimpleName(),
+                                    e.getLocalizedMessage(),
+                                    cause.getClass().getSimpleName(),
+                                    cause.getLocalizedMessage());
+                } else {
+                    logClient.debug("ComProtocolHandler failed to close: {}: {}, cause: <none>",
+                                    e.getClass().getSimpleName(),
+                                    e.getLocalizedMessage());
+                }
+            }
+        }
+    }
 
     // ----------------------------------------------------------------------------------------------------