Index: applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java
===================================================================
--- applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java	(revision 32066)
+++ applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java	(revision 32067)
@@ -3,6 +3,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -20,5 +22,5 @@
  * @author floscher
  */
-public class TestUtil {
+public final class TestUtil {
   private static boolean isInitialized;
 
@@ -33,5 +35,5 @@
    * That is needed e.g. to use {@link MapillaryLayer#getInstance()}
    */
-  public static final void initPlugin() {
+  public static final synchronized void initPlugin() {
     if (!isInitialized) {
       System.setProperty("josm.home", "test/data/preferences");
@@ -73,6 +75,6 @@
         assertTrue(m.getDeclaringClass() != c || Modifier.isStatic(m.getModifiers()));
       }
-    } catch (Exception e) {
-      assertTrue(e.getMessage(), false);
+    } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+      fail(e.getLocalizedMessage());
     }
   }