diff --git a/network/src/main/java/io/bitsquare/messages/arbitration/Dispute.java b/network/src/main/java/io/bitsquare/messages/arbitration/Dispute.java
index 752df10897..2b79b5c2dc 100644
--- a/network/src/main/java/io/bitsquare/messages/arbitration/Dispute.java
+++ b/network/src/main/java/io/bitsquare/messages/arbitration/Dispute.java
@@ -36,6 +36,7 @@ import java.io.ObjectInputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -356,7 +357,7 @@ public final class Dispute implements Payload {
 
     @Override
     public Messages.Dispute toProtoBuf() {
-        return Messages.Dispute.newBuilder().setTradeId(tradeId)
+        Messages.Dispute.Builder builder = Messages.Dispute.newBuilder().setTradeId(tradeId)
                 .setId(id)
                 .setTraderId(traderId)
                 .setDisputeOpenerIsBuyer(disputeOpenerIsBuyer)
@@ -366,18 +367,21 @@ public final class Dispute implements Payload {
                 .setTradeDate(tradeDate)
                 .setContract(contract.toProtoBuf())
                 .setContractHash(ByteString.copyFrom(contractHash))
-                .setDepositTxSerialized(ByteString.copyFrom(depositTxSerialized))
-                .setPayoutTxId(payoutTxId)
-                .setDepositTxId(depositTxId)
-                .setPayoutTxId(payoutTxId)
                 .setContractAsJson(contractAsJson)
                 .setOffererContractSignature(offererContractSignature)
                 .setTakerContractSignature(takerContractSignature)
                 .setArbitratorPubKeyRing(arbitratorPubKeyRing.toProtoBuf())
                 .setIsSupportTicket(isSupportTicket)
-                .addAllDisputeCommunicationMessages(disputeCommunicationMessages.stream().map(disputeCommunicationMessage -> disputeCommunicationMessage.toProtoBuf().getDisputeCommunicationMessage()).collect(Collectors.toList()))
+                .addAllDisputeCommunicationMessages(disputeCommunicationMessages.stream().map(
+                        disputeCommunicationMessage -> disputeCommunicationMessage.toProtoBuf().getDisputeCommunicationMessage()).collect(Collectors.toList()))
                 .setIsClosed(isClosed)
-                .setDisputeResult((Messages.DisputeResult) disputeResult.toProtoBuf())
-                .setDisputePayoutTxId(disputePayoutTxId).build();
+                .setDisputeResult(disputeResult.toProtoBuf());
+
+        Optional.ofNullable(depositTxSerialized).ifPresent(tx -> builder.setDepositTxSerialized(ByteString.copyFrom(tx)));
+        Optional.ofNullable(payoutTxSerialized).ifPresent(tx -> builder.setPayoutTxSerialized(ByteString.copyFrom(tx)));
+        Optional.ofNullable(depositTxId).ifPresent(builder::setDepositTxId);
+        Optional.ofNullable(payoutTxId).ifPresent(builder::setPayoutTxId);
+        Optional.ofNullable(disputePayoutTxId).ifPresent(builder::setDisputePayoutTxId);
+        return builder.build();
     }
 }
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java b/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java
index 9268ce4099..1c9b4e0e11 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/storageentry/ProtectedStorageEntry.java
@@ -42,7 +42,6 @@ public class ProtectedStorageEntry implements Payload {
         this.sequenceNumber = sequenceNumber;
         this.signature = signature;
         this.creationTimeStamp = System.currentTimeMillis();
-        System.out.println("currenttime = " + this.creationTimeStamp);
         this.ownerPubKeyBytes = new X509EncodedKeySpec(this.ownerPubKey.getEncoded()).getEncoded();
     }
 
@@ -53,7 +52,6 @@ public class ProtectedStorageEntry implements Payload {
         this.signature = signature;
         this.ownerPubKeyBytes = ownerPubKeyBytes;
         this.creationTimeStamp = creationTimeStamp;
-        System.out.println("creationtime = " + this.creationTimeStamp);
         init();
     }