Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java	(revision 10201)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/EmailValidator.java	(revision 10202)
@@ -73,11 +73,4 @@
     private static final EmailValidator EMAIL_VALIDATOR_WITH_LOCAL = new EmailValidator(true, false);
 
-
-    /**
-     * Singleton instance of this class, which does
-     *  consider local addresses valid.
-     */
-    private static final EmailValidator EMAIL_VALIDATOR_WITH_LOCAL_WITH_TLD = new EmailValidator(true, true);
-
     /**
      * Returns the Singleton instance of this validator.
@@ -99,9 +92,5 @@
     public static EmailValidator getInstance(boolean allowLocal, boolean allowTld) {
         if (allowLocal) {
-            if (allowTld) {
-                return EMAIL_VALIDATOR_WITH_LOCAL_WITH_TLD;
-            } else {
-                return EMAIL_VALIDATOR_WITH_LOCAL;
-            }
+            return EMAIL_VALIDATOR_WITH_LOCAL;
         } else {
             if (allowTld) {
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 10201)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 10202)
@@ -13,4 +13,5 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -409,3 +410,11 @@
         assertTrue(r2.getMembers().contains(new RelationMember("relation-1", r1)));
     }
+
+    /**
+     * Unit test of {@code AbstractVisitor#visit(org.openstreetmap.josm.data.osm.Changeset)}.
+     */
+    @Test
+    public void testVisitChangeset() {
+        new MergeSourceBuildingVisitor(new DataSet()).visit(new Changeset());
+    }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java	(revision 10201)
+++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/EmailValidatorTest.java	(revision 10202)
@@ -60,4 +60,5 @@
     public void testEmail()  {
         assertTrue(validator.isValid("jsmith@apache.org"));
+        assertFalse(validator.isValid(null));
     }