Better check for programmers configuration when uploading using programmer

Author: cmaglie

app/src/cc/arduino/packages/uploaders/SerialUploader.java

@@ -26,18 +26,22 @@
 
 package cc.arduino.packages.uploaders;
 
-import cc.arduino.packages.Uploader;
-import processing.app.*;
-import processing.app.debug.RunnerException;
-import processing.app.debug.TargetPlatform;
-import processing.app.helpers.PreferencesMap;
-import processing.app.helpers.StringReplacer;
+import static processing.app.I18n._;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import static processing.app.I18n._;
+import processing.app.Base;
+import processing.app.I18n;
+import processing.app.Preferences;
+import processing.app.Serial;
+import processing.app.SerialException;
+import processing.app.debug.RunnerException;
+import processing.app.debug.TargetPlatform;
+import processing.app.helpers.PreferencesMap;
+import processing.app.helpers.StringReplacer;
+import cc.arduino.packages.Uploader;
 
 public class SerialUploader extends Uploader {
 
@@ -209,7 +213,11 @@ public boolean uploadUsingProgrammer(String buildPath, String className) throws
 
     PreferencesMap prefs = Preferences.getMap();
     prefs.putAll(Base.getBoardPreferences());
-    prefs.putAll(targetPlatform.getProgrammer(programmer));
+    PreferencesMap programmerPrefs = targetPlatform.getProgrammer(programmer);
+    if (programmerPrefs == null)
+      throw new RunnerException(
+          _("Please select a programmer from Tools->Programmer menu"));
+    prefs.putAll(programmerPrefs);
     prefs.putAll(targetPlatform.getTool(prefs.getOrExcept("program.tool")));
 
     prefs.put("build.path", buildPath);
@@ -251,6 +259,9 @@ public boolean burnBootloader() throws Exception {
     } else {
       programmerPrefs = targetPlatform.getProgrammer(programmer);
     }
+    if (programmerPrefs == null)
+      throw new RunnerException(
+          _("Please select a programmer from Tools->Programmer menu"));
 
     // Build configuration for the current programmer
     PreferencesMap prefs = Preferences.getMap();