From a41c9e339a80e972744070a21e029cab12fffab4 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Wed, 15 Dec 2021 11:31:12 +0000
Subject: [PATCH] Fixed occasional NPE

---
 .../org/qortal/controller/arbitrary/ArbitraryDataManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
index c8142c92..3c7310ab 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
@@ -775,10 +775,10 @@ public class ArbitraryDataManager extends Thread {
 
 		// Do we have a pending request for this data?
 		Triple<String, Peer, Long> request = arbitraryDataFileListRequests.get(message.getId());
-		boolean isRelayRequest = (request.getB() != null);
 		if (request == null || request.getA() == null) {
 			return;
 		}
+		boolean isRelayRequest = (request.getB() != null);
 
 		// Does this message's signature match what we're expecting?
 		byte[] signature = arbitraryDataFileListMessage.getSignature();