Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 2130)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 2131)
@@ -196,5 +196,5 @@
         };
         for (Object o : lstConflicts.getSelectedValues()) {
-            if (!conflicts.hasConflictForMy((OsmPrimitive)o)) {
+            if (conflicts == null || !conflicts.hasConflictForMy((OsmPrimitive)o)) {
                 continue;
             }
@@ -252,5 +252,5 @@
         lstConflicts.clearSelection();
         for (OsmPrimitive osm : newSelection) {
-            if (conflicts.hasConflictForMy(osm)) {
+            if (conflicts != null && conflicts.hasConflictForMy(osm)) {
                 int pos = model.indexOf(osm);
                 if (pos >= 0) {