diff --git a/arduino-core/src/processing/app/debug/Compiler.java b/arduino-core/src/processing/app/debug/Compiler.java
index 528b353aa..e94d9aead 100644
--- a/arduino-core/src/processing/app/debug/Compiler.java
+++ b/arduino-core/src/processing/app/debug/Compiler.java
@@ -135,15 +135,12 @@ public class Compiler implements MessageConsumer {
     TargetPlatform target = BaseNoGui.getTargetPlatform();
     String board = PreferencesData.get("board");
 
-    if (noUploadPort)
-    {
-      return new UploaderFactory().newUploader(target.getBoards().get(board), null, noUploadPort);
-    }
-    else
-    {
-      BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
-      return new UploaderFactory().newUploader(target.getBoards().get(board), boardPort, noUploadPort);
+    BoardPort boardPort = null;
+    if (!noUploadPort) {
+      boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
     }
+
+    return new UploaderFactory().newUploader(target.getBoards().get(board), boardPort, noUploadPort);
   }
 
   static public boolean upload(SketchData data, Uploader uploader, String buildPath, String suggestedClassName, boolean usingProgrammer, boolean noUploadPort, List<String> warningsAccumulator) throws Exception {