Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java	(revision 10031)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java	(revision 10032)
@@ -106,9 +106,5 @@
         protected void finish() {
             rememberDownloadedData(new NoteData(notesData));
-            if (isCanceled() || isFailed()) {
-                return;
-            }
-
-            if (notesData == null) {
+            if (isCanceled() || isFailed() || notesData == null || notesData.isEmpty()) {
                 return;
             }
@@ -121,11 +117,8 @@
                 noteLayers = Main.map.mapView.getLayersOfType(NoteLayer.class);
             }
-            NoteLayer layer;
             if (noteLayers != null && !noteLayers.isEmpty()) {
-                layer = noteLayers.get(0);
-                layer.getNoteData().addNotes(notesData);
+                noteLayers.get(0).getNoteData().addNotes(notesData);
             } else {
-                layer = new NoteLayer(notesData, tr("Notes"));
-                Main.main.addLayer(layer);
+                Main.main.addLayer(new NoteLayer(notesData, tr("Notes")));
             }
         }