diff --git a/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java b/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java
index bb485266c5..f1b64b90de 100644
--- a/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java
+++ b/java_console/models/src/com/fathzer/soft/javaluator/AbstractEvaluator.java
@@ -193,7 +193,7 @@ public abstract class AbstractEvaluator<T> {
 		// Be aware that arguments are in reverse order on the values stack.
 		// Don't forget to reorder them in the original order (the one they appear in the evaluated formula)
 		if (values.size()<nb) {
-			throw new IllegalArgumentException();
+			throw new IllegalArgumentException("Expected " + nb + " got " + values.size());
 		}
 		LinkedList<T> result = new LinkedList<T>();
 		for (int i = 0; i <nb ; i++) {
diff --git a/java_console/ui/src/com/rusefi/ui/widgets/AnyCommand.java b/java_console/ui/src/com/rusefi/ui/widgets/AnyCommand.java
index 31d28dd4d9..79adb03974 100644
--- a/java_console/ui/src/com/rusefi/ui/widgets/AnyCommand.java
+++ b/java_console/ui/src/com/rusefi/ui/widgets/AnyCommand.java
@@ -1,6 +1,7 @@
 package com.rusefi.ui.widgets;
 
 import com.fathzer.soft.javaluator.DoubleEvaluator;
+import com.rusefi.FileLog;
 import com.rusefi.io.CommandQueue;
 import com.rusefi.ui.RecentCommands;
 import com.rusefi.ui.storage.Node;
@@ -117,11 +118,16 @@ public class AnyCommand {
     }
 
     public static String prepareCommand(String rawCommand) {
-        if (rawCommand.startsWith("eval ")) {
-            return prepareEvalCommand(rawCommand);
-        } else if (rawCommand.startsWith("set_fsio_expression ")) {
-            return prepareSetFsioCommand(rawCommand);
-        } else {
+        try {
+            if (rawCommand.startsWith("eval ")) {
+                return prepareEvalCommand(rawCommand);
+            } else if (rawCommand.startsWith("set_fsio_expression ")) {
+                return prepareSetFsioCommand(rawCommand);
+            } else {
+                return rawCommand;
+            }
+        } catch (Throwable e) {
+            FileLog.MAIN.log(e);
             return rawCommand;
         }
     }