From 2893c2d64314f3fa298fffb5c90d8e27c8614d08 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@vdnsbg.com>
Date: Sat, 23 Jan 2016 14:06:22 +0200
Subject: [PATCH] Fix adding NULL value to the preferences when iserial is not
 defined

---
 .../src/cc/arduino/packages/uploaders/SerialUploader.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
index d7fc02b77..971bfb8c6 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -155,7 +155,7 @@ public class SerialUploader extends Uploader {
 
     BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
     try {
-      prefs.put("serial.port.iserial", boardPort.getPrefs().get("iserial"));
+      prefs.put("serial.port.iserial", boardPort.getPrefs().getOrExcept("iserial"));
     } catch (Exception e) {
       // if serial port does not contain an iserial field
     }