Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 11352)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 11354)
@@ -33,4 +33,5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
@@ -196,5 +197,8 @@
     public void prepareForEditing() {
         AutoCompletionList acList = new AutoCompletionList();
-        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithMemberRoles(acList);
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+        if (editLayer != null) {
+            editLayer.data.getAutoCompletionManager().populateWithMemberRoles(acList);
+        }
         tfRole.setAutoCompletionList(acList);
         AutoCompletingTextField editor = (AutoCompletingTextField) tblResolver.getColumnModel().getColumn(2).getCellEditor();
@@ -203,5 +207,7 @@
         }
         AutoCompletionList acList2 = new AutoCompletionList();
-        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithKeys(acList2);
+        if (editLayer != null) {
+            editLayer.data.getAutoCompletionManager().populateWithKeys(acList2);
+        }
         tfKey.setAutoCompletionList(acList2);
     }