diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
index 58dc40c7b7..8a7fe7ff11 100644
--- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
+++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
@@ -399,7 +399,7 @@ public class BinaryProtocol {
 
             offset += requestSize;
         }
-        if (arguments.saveFile) {
+        if (arguments != null && arguments.saveFile) {
             try {
                 ConfigurationImageFile.saveToFile(image, CONFIGURATION_RUSEFI_BINARY);
                 Msq tune = MsqFactory.valueOf(image);