From d24d05d08db2dd98b11d1d4fbb31f3c22b6608ce Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Sat, 19 Dec 2020 15:37:02 -0500
Subject: [PATCH] Fix nullpointer

A Nullpointer can happen if app get shut down very early.
---
 .../main/java/bisq/network/p2p/network/TorNetworkNode.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java b/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
index a1aae19babc..edcd6a78e28 100644
--- a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
+++ b/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
@@ -184,7 +184,9 @@ private BooleanProperty torNetworkNodeShutDown() {
                 log.info("Tor shut down completed");
             } else {
                 log.info("Tor has not been created yet. We cancel the torStartupFuture.");
-                torStartupFuture.cancel(true);
+                if (torStartupFuture != null) {
+                    torStartupFuture.cancel(true);
+                }
                 log.info("torStartupFuture cancelled");
             }
         } catch (Throwable e) {