diff --git a/core/src/main/java/io/xpipe/core/process/BufferedProcessInputStream.java b/core/src/main/java/io/xpipe/core/process/BufferedProcessInputStream.java
deleted file mode 100644
index 2c52cfde1..000000000
--- a/core/src/main/java/io/xpipe/core/process/BufferedProcessInputStream.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.xpipe.core.process;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-
-public class BufferedProcessInputStream extends BufferedInputStream {
-
-    public BufferedProcessInputStream(InputStream in, int size) {
-        super(in, size);
-    }
-
-    public int bufferedAvailable() {
-        return count - pos;
-    }
-}
diff --git a/core/src/main/java/io/xpipe/core/process/CommandControl.java b/core/src/main/java/io/xpipe/core/process/CommandControl.java
index ed4d70fd8..611b3931f 100644
--- a/core/src/main/java/io/xpipe/core/process/CommandControl.java
+++ b/core/src/main/java/io/xpipe/core/process/CommandControl.java
@@ -93,7 +93,7 @@ public interface CommandControl extends ProcessControl {
             discardOrThrow();
             return true;
         } catch (ProcessOutputException ex) {
-            if (ex.isTimeOut()) {
+            if (ex.isIrregularExit()) {
                 throw ex;
             }
 
diff --git a/core/src/main/java/io/xpipe/core/process/ProcessOutputException.java b/core/src/main/java/io/xpipe/core/process/ProcessOutputException.java
index c4e49889f..cb2cfb9f7 100644
--- a/core/src/main/java/io/xpipe/core/process/ProcessOutputException.java
+++ b/core/src/main/java/io/xpipe/core/process/ProcessOutputException.java
@@ -44,8 +44,8 @@ public class ProcessOutputException extends Exception {
         this.output = output;
     }
 
-    public boolean isTimeOut() {
-        return exitCode == CommandControl.EXIT_TIMEOUT_EXIT_CODE;
+    public boolean isIrregularExit() {
+        return exitCode == CommandControl.EXIT_TIMEOUT_EXIT_CODE || exitCode == CommandControl.START_FAILED_EXIT_CODE || exitCode == CommandControl.UNASSIGNED_EXIT_CODE || exitCode == CommandControl.INTERNAL_ERROR_EXIT_CODE;
     }
 
     public boolean isKill() {