fixed null ref

notesolver/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "java.project.referencedLibraries": [
+        "lib/**/*.jar",
+        "d:\\_dev\\osm\\josm\\josm\\core\\dist\\josm-custom.jar"
+    ]
+}

notesolver/MANIFEST

@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.10.7
 Created-By: 1.8.0_251-b08 (Oracle Corporation)
-Plugin-Mainversion: 10580
+Plugin-Mainversion: 16538
 Plugin-Version: UNKNOWN
 Plugin-Class: org.openstreetmap.josm.plugins.notesolver.NoteSolverPlug
  in
 Plugin-Description: Used for closing notes when uploading a changeset 
  and referencing them in each other's comments to keep references.
-Plugin-Date: 2020-05-16T08:55:03.428
+Plugin-Date: 2020-06-07T09:27:07.003
 Author: Kai Michael Poppe
 Plugin-Link: https://wiki.openstreetmap.org/wiki/User:Kmpoppe/Plugins#
  noteSolver

notesolver/build.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="notesolver" default="dist" basedir=".">
 	<property name="commit.message" value="Note Solver"/>
-    <property name="plugin.main.version" value="10580"/>
-    <property name="plugin.version" value="16000"/>
+    <property name="plugin.main.version" value="16538"/>
+    <property name="plugin.version" value="0.3.2"/>
     <property name="plugin.author" value="Kai Michael Poppe"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.notesolver.NoteSolverPlugin"/>   
     <property name="plugin.description" value="Used for closing notes when uploading a changeset and referencing them in each other's comments to keep references."/>

notesolver/src/org/openstreetmap/josm/plugins/notesolver/NoteSolverPlugin.java

@@ -87,8 +87,10 @@ public boolean checkUpload(APIDataSet apiDataSet) {
 						String comment = MainApplication.getLayerManager().getEditDataSet().getChangeSetTags().get("comment");
 						for (Note note : solvedNotes) {
 							String noteLink = "Closes " + getUrl(note, linkTypes.NOTE);
-							comment = comment.replace("; " + noteLink, "");
-							comment = comment.replace(noteLink, "");
+							if (comment != null) {
+								comment = comment.replace("; " + noteLink, "");
+								comment = comment.replace(noteLink, "");
+							}
 						}
 						for (Note note : rememberedNotes) {
 							String noteLink = "Closes " + getUrl(note, linkTypes.NOTE);