Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 20684)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 20696)
@@ -437,5 +437,8 @@
         if(newSelection.size() == 1 && newSelection.iterator().next() instanceof Node) {
             Node selectedNode = (Node) newSelection.iterator().next();
-            if(osbPlugin.getLayer().getDataSet().getNodes().contains(selectedNode)) {
+            if(osbPlugin.getLayer() != null && osbPlugin.getLayer().getDataSet() != null
+                    && osbPlugin.getLayer().getDataSet().getNodes() != null
+                    && osbPlugin.getLayer().getDataSet().getNodes().contains(selectedNode)) 
+            {
                 setSelectedNode(selectedNode);
             } else {