diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
index ce93e5e4f8..70cbe999f2 100644
--- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
+++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
@@ -232,7 +232,7 @@ public class RuffyScripter implements RuffyCommands {
         List<String> violations = cmd.validateArguments();
         if (!violations.isEmpty()) {
             log.error("Command argument violations: " + Joiner.on(", ").join(violations));
-            return new CommandResult().state(readPumpStateInternal());
+            return new CommandResult().success(false).state(readPumpStateInternal());
         }
 
         // TODO simplify, hard to reason about exists
@@ -358,7 +358,7 @@ public class RuffyScripter implements RuffyCommands {
     }
 
     private long calculateOverallCmdTimeout() {
-        return System.currentTimeMillis() + 3 * 60 * 1000;
+        return System.currentTimeMillis() + 4 * 60 * 1000;
     }
 
     /**