From 0ed5bc921568f7199663ecfbd93b33af024b8571 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 7 Sep 2026 14:10:18 +0000
Subject: [PATCH] Fix NPEs

---
 .../java/io/xpipe/app/hub/creation/StoreCreationMenu.java     | 4 ++++
 app/src/main/java/io/xpipe/app/util/HttpProxy.java            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationMenu.java b/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationMenu.java
index 1a39034f3..62bd03004 100644
--- a/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationMenu.java
+++ b/app/src/main/java/io/xpipe/app/hub/creation/StoreCreationMenu.java
@@ -186,6 +186,10 @@ public class StoreCreationMenu {
                         () -> DataStorage.get().local().ref(),
                         () -> null,
                         fileReference -> {
+                            if (fileReference == null) {
+                                return;
+                            }
+
                             var file = fileReference.getPath().asLocalPath();
                             ThreadHelper.runFailableAsync(() -> {
                                 ProcModuleProvider.get().importRdpFile(file);
diff --git a/app/src/main/java/io/xpipe/app/util/HttpProxy.java b/app/src/main/java/io/xpipe/app/util/HttpProxy.java
index 2bebf8899..e0cf7ba5e 100644
--- a/app/src/main/java/io/xpipe/app/util/HttpProxy.java
+++ b/app/src/main/java/io/xpipe/app/util/HttpProxy.java
@@ -33,7 +33,7 @@ public class HttpProxy {
             if (env != null) {
                 try {
                     var parsed = URI.create(env);
-                    var isSocks = parsed.getScheme().equals("socks5");
+                    var isSocks = parsed.getScheme() != null && parsed.getScheme().equals("socks5");
                     var host = parsed.getHost();
                     var port = parsed.getPort() != -1 ? parsed.getPort() : isSocks ? 1080 : 8080;
                     var userInfo = parsed.getUserInfo();