From 706ec5a2ed495e7317956f82c674d0efe255ee2d Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Thu, 19 Nov 2020 00:07:34 -0500
Subject: [PATCH] Add null checks for tradeManager

We get called some setter methods from protobuf methods before tradeManager is set.
---
 .../main/java/bisq/core/trade/protocol/ProcessModel.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java b/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java
index 0aeac20f04..ad0e10d671 100644
--- a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java
+++ b/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java
@@ -294,7 +294,9 @@ public class ProcessModel implements Model, PersistablePayload {
 
     public void setPaymentStartedMessageState(MessageState paymentStartedMessageStateProperty) {
         this.paymentStartedMessageStateProperty.set(paymentStartedMessageStateProperty);
-        tradeManager.requestPersistence();
+        if (tradeManager != null) {
+            tradeManager.requestPersistence();
+        }
     }
 
     void setDepositTxSentAckMessage(AckMessage ackMessage) {
@@ -306,7 +308,9 @@ public class ProcessModel implements Model, PersistablePayload {
 
     public void setDepositTxMessageState(MessageState messageState) {
         this.depositTxMessageStateProperty.set(messageState);
-        tradeManager.requestPersistence();
+        if (tradeManager != null) {
+            tradeManager.requestPersistence();
+        }
     }
 
     void witnessDebugLog(Trade trade) {