From b69e48d576c68dc41026b761e5e02c652dfd9157 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sat, 22 Nov 2025 22:18:31 +0000
Subject: [PATCH] Fix prefs load message about invalid values

---
 .../main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
index e04a1fea0..abd42e034 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsStorageHandler.java
@@ -108,6 +108,10 @@ public class AppPrefsStorageHandler {
             return defaultObject;
         }
 
+        if (tree.isNull()) {
+            return null;
+        }
+
         if (PrefsChoiceValue.class.isAssignableFrom(type.getRawClass())) {
             List<T> all = (List<T>) getAll(type.getRawClass());
             if (all != null) {