From 97821de2e46619a3dfba33a5d252e1727232e478 Mon Sep 17 00:00:00 2001
From: HenrikJannsen <boilingfrog@gmx.com>
Date: Thu, 28 Mar 2024 10:52:50 +0700
Subject: [PATCH] Fix nullpointer at shutdown

---
 .../security_manager/alert/AlertNotificationsService.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonded-roles/src/main/java/bisq/bonded_roles/security_manager/alert/AlertNotificationsService.java b/bonded-roles/src/main/java/bisq/bonded_roles/security_manager/alert/AlertNotificationsService.java
index 378c6471c1..8b1603c52f 100644
--- a/bonded-roles/src/main/java/bisq/bonded_roles/security_manager/alert/AlertNotificationsService.java
+++ b/bonded-roles/src/main/java/bisq/bonded_roles/security_manager/alert/AlertNotificationsService.java
@@ -81,8 +81,10 @@ public void clear() {
 
     @Override
     public CompletableFuture<Boolean> shutdown() {
-        authorizedAlertDataSetPin.unbind();
-        unconsumedAlertsPin.unbind();
+        if (authorizedAlertDataSetPin != null) {
+            authorizedAlertDataSetPin.unbind();
+            unconsumedAlertsPin.unbind();
+        }
 
         return CompletableFuture.completedFuture(true);
     }