Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 14709)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java	(revision 14710)
@@ -399,9 +399,11 @@
             T entry = source.get(row);
             OsmPrimitive primitive = getMyPrimitive(entry);
-            if (!primitive.isDeleted()) {
-                T clone = cloneEntryForMergedList(entry);
-                newItems.add(clone);
-            } else {
-                deletedIds.add(primitive.getPrimitiveId());
+            if (primitive != null) {
+                if (!primitive.isDeleted()) {
+                    T clone = cloneEntryForMergedList(entry);
+                    newItems.add(clone);
+                } else {
+                    deletedIds.add(primitive.getPrimitiveId());
+                }
             }
         }