diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
index b20a492430..450ab4f654 100644
--- a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
+++ b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java
@@ -34,18 +34,18 @@ public class DfuFlasher {
             public void actionPerformed(ActionEvent event) {
                 // todo: better usability would be to disable "Program" port in case of no ports found
                 Object selectedItem = comboPorts.getSelectedItem();
-                if (selectedItem == null) {
-                    JOptionPane.showMessageDialog(comboPorts, "Failed to located serial ports");
-                } else {
-                    doAutoDfu(selectedItem);
-                }
+                doAutoDfu(selectedItem, comboPorts);
             }
         });
 
         manualButton.addActionListener(e -> runDfuProgramming());
     }
 
-    public static void doAutoDfu(Object selectedItem) {
+    public static void doAutoDfu(Object selectedItem, JComponent parent) {
+        if (selectedItem == null) {
+            JOptionPane.showMessageDialog(parent, "Failed to located serial ports");
+            return;
+        }
         String port = selectedItem.toString();
         StringBuilder messages = new StringBuilder();
 
diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
index 3f59f7bffa..2cc29d0804 100644
--- a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
+++ b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
@@ -50,13 +50,12 @@ public class ProgramSelector {
 
                 getConfig().getRoot().setProperty(getClass().getSimpleName(), selectedMode);
 
-
                 boolean isAutoDfu = selectedMode.equals(AUTO_DFU);
                 boolean isManualDfu = selectedMode.equals(MANUAL_DFU);
                 // todo: add ST-LINK no-assert mode
 
                 if (isAutoDfu) {
-                    DfuFlasher.doAutoDfu(comboPorts.getSelectedItem());
+                    DfuFlasher.doAutoDfu(comboPorts.getSelectedItem(), comboPorts);
                 } else if (isManualDfu){
                     DfuFlasher.runDfuProgramming();
                 } else {