From c11ceb7daeb3de2ea5403cb990094270c335e4a3 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 25 Jan 2016 18:29:25 +0100
Subject: [PATCH] Fix NPE when replacing unexisting strings

---
 arduino-core/src/processing/app/helpers/StringReplacer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arduino-core/src/processing/app/helpers/StringReplacer.java b/arduino-core/src/processing/app/helpers/StringReplacer.java
index f51bfd7b6..fae77155a 100644
--- a/arduino-core/src/processing/app/helpers/StringReplacer.java
+++ b/arduino-core/src/processing/app/helpers/StringReplacer.java
@@ -94,7 +94,9 @@ public class StringReplacer {
                                           String rightDelimiter) {
     for (Map.Entry<String, String> entry : map.entrySet()) {
       String keyword = leftDelimiter + entry.getKey() + rightDelimiter;
-      src = src.replace(keyword, entry.getValue());
+      if (entry.getValue() != null && keyword != null) {
+          src = src.replace(keyword, entry.getValue());
+      }
     }
     return src;
   }