Index: trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java	(revision 10670)
+++ trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java	(revision 10671)
@@ -69,6 +69,7 @@
                 return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}",
                         getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+            default:
+                return "";
         }
-        return "";
     }
 
Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 10670)
+++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 10671)
@@ -147,6 +147,7 @@
         case RELATION:
             return appendRelation((Relation) p);
-        }
-        return this;
+        default:
+            return this;
+        }
     }
 
@@ -217,4 +218,5 @@
                 case WAY: return appendWay((Way) primitive);
                 case RELATION: return appendRelation((Relation) primitive);
+                default: break;
             }
         }