From 8d876960ed6fe387ebbf863a50cb151898c4eab7 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 5 Jan 2026 15:10:26 +0000
Subject: [PATCH] aws profile fixes

---
 app/src/main/java/io/xpipe/app/storage/DataStorage.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index 4d349ba47..97256baec 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -762,8 +762,11 @@ public abstract class DataStorage {
             }
 
             var s = pair.getKey().getStorePersistentState();
-            var mergedState = s.mergeCopy(pair.getValue().get().getStorePersistentState());
-            pair.getKey().setStorePersistentState(mergedState);
+            // We might not be a stateful store
+            if (s != null) {
+                var mergedState = s.mergeCopy(pair.getValue().get().getStorePersistentState());
+                pair.getKey().setStorePersistentState(mergedState);
+            }
 
             if (pair.getKey().getOrderIndex() == 0 && pair.getValue().get().getOrderIndex() != 0) {
                 pair.getKey().setOrderIndex(pair.getValue().get().getOrderIndex());