Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 13395)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 13396)
@@ -889,4 +889,7 @@
         Main.platform.preStartupHook();
 
+        Config.setPreferencesInstance(Main.pref);
+        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
+
         if (args.showVersion()) {
             System.out.println(Version.getInstance().getAgentString());
@@ -908,6 +911,4 @@
         }
 
-        Config.setPreferencesInstance(Main.pref);
-        Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Main.pref.init(args.hasOption(Option.RESET_PREFERENCES));