Index: trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java	(revision 18869)
+++ trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java	(revision 18870)
@@ -356,5 +356,7 @@
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("epsg:3857".toUpperCase(Locale.ROOT)));
 
-        Territories.initializeInternalData();
+        if (Territories.getKnownIso3166Codes().isEmpty()) {
+            Territories.initializeInternalData();
+        }
         OsmValidator.initialize();
         MapPaintStyles.readFromPreferences();
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java	(revision 18869)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java	(revision 18870)
@@ -458,5 +458,5 @@
                     List<Way> prims = Arrays.asList(es1.getWay(), es2.getWay());
                     if ((highlight = crossingWays.get(prims)) == null) {
-                        highlight = new ArrayList<>();
+                        highlight = new ArrayList<>(2);
                         highlight.add(es1);
                         highlight.add(es2);