Index: applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java
===================================================================
--- applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java	(revision 36015)
+++ applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java	(revision 36176)
@@ -4,4 +4,5 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.ServiceLoader;
@@ -15,6 +16,6 @@
 import org.geotools.image.ImageWorker;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.NoSuchAuthorityCodeException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.NoSuchAuthorityCodeException;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -102,10 +103,13 @@
 
     private static void checkEPSG() {
+        final Collection<String> codes = CRS.getSupportedCodes("EPSG");
+        if (codes.isEmpty() || !(codes.contains("4326") || codes.contains("EPSG:4326"))) {
         try {
-            CRS.decode("EPSG:4326");
-        } catch (NoSuchAuthorityCodeException e) {
-            Logging.error("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: "+e.getMessage());
-        } catch (FactoryException e) {
-            Logging.error("geotools: error in EPSG database initialization. FactoryException: "+e.getMessage());
+                CRS.decode("EPSG:4326");
+            } catch (NoSuchAuthorityCodeException e) {
+                Logging.error("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: " + e.getMessage());
+            } catch (FactoryException e) {
+                Logging.error("geotools: error in EPSG database initialization. FactoryException: " + e.getMessage());
+            }
         }
     }