Index: src/org/openstreetmap/josm/gui/layer/NoteLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 7819)
+++ src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(working copy)
@@ -49,7 +49,6 @@
     public NoteLayer(List<Note> notes, String name) {
         super(name);
         noteData = new NoteData(notes);
-        init();
     }
 
     /** Convenience constructor that creates a layer with an empty note list */
@@ -56,13 +55,11 @@
     public NoteLayer() {
         super(tr("Notes"));
         noteData = new NoteData();
-        init();
     }
 
-    private void init() {
-        if (Main.map != null && Main.map.mapView != null) {
-            Main.map.mapView.addMouseListener(this);
-        }
+    @Override
+    public void hookUpMapView() {
+        Main.map.mapView.addMouseListener(this);
     }
 
     /**