diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataBuilderThread.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataBuilderThread.java
index da7c7293..781c0a84 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataBuilderThread.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataBuilderThread.java
@@ -39,7 +39,7 @@ public class ArbitraryDataBuilderThread implements Runnable {
                 Map.Entry<String, ArbitraryDataBuildQueueItem> next = buildManager.arbitraryDataBuildQueue
                         .entrySet().stream()
                         .filter(e -> e.getValue().isQueued())
-                        .findFirst().get();
+                        .findFirst().orElse(null);
 
                 if (next == null) {
                     continue;