From 52ef55380d824da016d0562d396ceabe88b7edd1 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 23 Feb 2016 15:59:21 +0100
Subject: [PATCH] avoid NPE if serial monitor is waiting too long for opening

---
 app/src/processing/app/Editor.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index aef2bcdb8..d018b69b2 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -2442,13 +2442,14 @@ public class Editor extends JFrame implements RunnerListener {
         }
       }
       try {
-        if (serialMonitor != null)
-          serialMonitor.resume(boardPort);
-        if (boardPort == null) {
-          serialMonitor.close();
-          handleSerial();
-        } else {
+        if (serialMonitor != null) {
           serialMonitor.resume(boardPort);
+          if (boardPort == null) {
+            serialMonitor.close();
+            handleSerial();
+          } else {
+            serialMonitor.resume(boardPort);
+          }
         }
       } catch (Exception e) {
         statusError(e);