diff --git a/README.md b/README.md
index 275e2f7c..09c62178 100644
--- a/README.md
+++ b/README.md
@@ -136,11 +136,7 @@ You can use the gradle wrapper to build and run the project:
   To include this CLI executable in this build, make sure to run `gradlew buildCli` first
 - You can also run the CLI application in development mode with something like `gradlew :cli:clean :cli:run --args="daemon start"`.
   Note here that you should always clean the CLI project first, as the native image plugin is a little buggy in that regard.
-- `gradlew <project>:test` will run the tests of the specified project. 
-
-Some production unit tests depend on a connection to an X-Pipe daemon to properly function.
-To launch the installed daemon, it is required that you either have X-Pipe
-installed or have set the `XPIPE_HOME` environment variable in case you are using a portable version.
+- `gradlew <project>:test` will run the tests of the specified project.
 
 You are also able to properly debug the built production application through two different methods:
 - The `app/scripts/xpiped_debug` script will launch the application in debug mode and with a console attached to it
@@ -150,7 +146,6 @@ You are also able to properly debug the built production application through two
 Note that when any unit test is run using a debugger, the X-Pipe daemon process that is started will also attempt
 to connect to that debugger through [AttachMe](https://plugins.jetbrains.com/plugin/13263-attachme) as well.
 
-
 ### Development FAQ
 
 ##### Why are there no GitHub actions workflows or other continuous integration pipelines set up for this repository?
diff --git a/core/src/main/java/io/xpipe/core/process/ProcessControlProvider.java b/core/src/main/java/io/xpipe/core/process/ProcessControlProvider.java
index 82095f51..fddc67e1 100644
--- a/core/src/main/java/io/xpipe/core/process/ProcessControlProvider.java
+++ b/core/src/main/java/io/xpipe/core/process/ProcessControlProvider.java
@@ -47,7 +47,7 @@ public abstract class ProcessControlProvider {
                         localProcessControlProvider.command(parent, command, terminalCommand))
                 .filter(Objects::nonNull)
                 .findFirst()
-                .orElseThrow();
+                .orElse(null);
     }
 
     public static ShellProcessControl createSsh(Object sshStore) {