Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 17521)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 17522)
@@ -377,5 +377,7 @@
                 MainApplication.getLayerManager().addLayer(new NoteLayer());
             }
-            MainApplication.getMap().selectMapMode(new AddNoteAction(noteData));
+            if (noteData != null) {
+                MainApplication.getMap().selectMapMode(new AddNoteAction(noteData));
+            }
         }
     }