Index: trunk/src/org/openstreetmap/josm/data/notes/Note.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/notes/Note.java	(revision 10097)
+++ trunk/src/org/openstreetmap/josm/data/notes/Note.java	(revision 10098)
@@ -81,5 +81,5 @@
 
     public void addComment(NoteComment comment) {
-        this.comments.add(comment);
+        comments.add(comment);
     }
 
@@ -89,5 +89,5 @@
      */
     public NoteComment getFirstComment() {
-        return this.comments.get(0);
+        return comments.isEmpty() ? null : comments.get(0);
     }
 
Index: trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java	(revision 10097)
+++ trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java	(revision 10098)
@@ -67,4 +67,8 @@
     }
 
+    /**
+     * Sets whether this is a new comment/action and needs to be uploaded to the API
+     * @param isNew {@code true} if this is a new comment/action and needs to be uploaded to the API
+     */
     public void setNew(boolean isNew) {
         this.isNew = isNew;