Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 7642)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 7643)
@@ -194,5 +194,5 @@
      */
     public boolean isResolvedCompletely() {
-        return numConflicts == 0 && keysWithConflicts.isEmpty();
+        return numConflicts == 0 && keysWithConflicts != null && keysWithConflicts.isEmpty();
     }