Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 17078)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 17079)
@@ -845,5 +845,5 @@
         try {
             CertificateAmendment.addMissingCertificates();
-        } catch (IOException | GeneralSecurityException ex) {
+        } catch (IOException | GeneralSecurityException | SecurityException | ExceptionInInitializerError ex) {
             Logging.warn(ex);
             Logging.warn(Logging.getErrorMessage(Utils.getRootCause(ex)));