Index: /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 14169)
+++ /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java	(revision 14170)
@@ -18,4 +18,5 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.Logging;
@@ -109,5 +110,7 @@
                 Logging.error("Failed to upload note to server: {0}", note.getId());
                 Logging.error(e);
-                failedNotes.put(note, e);
+                if (!(e instanceof OsmTransferCanceledException)) {
+                    failedNotes.put(note, e);
+                }
             }
         }