From be75409276296d12abc8a0610677ec61f3e62a2c Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sat, 12 Sep 2026 18:29:15 +0000
Subject: [PATCH] Fix NPE

---
 .../io/xpipe/app/hub/creation/StoreCreationQueueEntry.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationQueueEntry.java b/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationQueueEntry.java
index 6a4d859f9..0602abee7 100644
--- a/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationQueueEntry.java
+++ b/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationQueueEntry.java
@@ -39,7 +39,12 @@ public class StoreCreationQueueEntry extends AppLayoutModel.QueueEntry {
             return Optional.empty();
         }
 
-        return AppLayoutModel.get().getQueueEntries().stream()
+        var l = AppLayoutModel.get();
+        if (l == null) {
+            return Optional.empty();
+        }
+
+        return l.getQueueEntries().stream()
                 .filter(queueEntry -> queueEntry instanceof StoreCreationQueueEntry q && entry.equals(q.getEntry()))
                 .findFirst();
     }