Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 11649)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 11650)
@@ -21,5 +21,4 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -156,9 +155,4 @@
 
     /**
-     * Command-line arguments used to run the application.
-     */
-    protected static final List<String> COMMAND_LINE_ARGS = new ArrayList<>();
-
-    /**
      * The worker thread slave. This is for executing all long and intensive
      * calculations. The executed runnables are guaranteed to be executed separately
@@ -212,5 +206,5 @@
     public static final FileWatcher fileWatcher = new FileWatcher();
 
-    protected static final Map<String, Throwable> NETWORK_ERRORS = new HashMap<>();
+    private static final Map<String, Throwable> NETWORK_ERRORS = new HashMap<>();
 
     private static final Set<OnlineResource> OFFLINE_RESOURCES = EnumSet.noneOf(OnlineResource.class);
@@ -1384,13 +1378,4 @@
 
     /**
-     * Returns the command-line arguments used to run the application.
-     * @return the command-line arguments used to run the application
-     * @since 8356
-     */
-    public static List<String> getCommandLineArgs() {
-        return Collections.unmodifiableList(COMMAND_LINE_ARGS);
-    }
-
-    /**
      * Returns the JOSM website URL.
      * @return the josm website URL
Index: trunk/src/org/openstreetmap/josm/actions/RestartAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 11649)
+++ trunk/src/org/openstreetmap/josm/actions/RestartAction.java	(revision 11650)
@@ -17,4 +17,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -165,5 +166,5 @@
         }
         // finally add program arguments
-        cmd.addAll(Main.getCommandLineArgs());
+        cmd.addAll(MainApplication.getCommandLineArgs());
         return cmd;
     }
Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 11649)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 11650)
@@ -29,4 +29,5 @@
 import org.openstreetmap.josm.data.preferences.Setting;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.SourceEditor;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
@@ -166,5 +167,5 @@
             Main.trace(e);
         }
-        List<String> commandLineArgs = Main.getCommandLineArgs();
+        List<String> commandLineArgs = MainApplication.getCommandLineArgs();
         if (!commandLineArgs.isEmpty()) {
             text.append("Program arguments: ").append(Arrays.toString(paramCleanup(commandLineArgs).toArray())).append('\n');
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 11649)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 11650)
@@ -23,8 +23,11 @@
 import java.security.Policy;
 import java.security.cert.CertificateException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -80,4 +83,9 @@
 public class MainApplication extends Main {
 
+    /**
+     * Command-line arguments used to run the application.
+     */
+    private static final List<String> COMMAND_LINE_ARGS = new ArrayList<>();
+
     private MainFrame mainFrame;
 
@@ -118,4 +126,13 @@
         }
         super.shutdown();
+    }
+
+    /**
+     * Returns the command-line arguments used to run the application.
+     * @return the command-line arguments used to run the application
+     * @since 11650
+     */
+    public static List<String> getCommandLineArgs() {
+        return Collections.unmodifiableList(COMMAND_LINE_ARGS);
     }
 
@@ -239,5 +256,5 @@
         }
 
-        Main.COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
+        COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
 
         boolean skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);
@@ -567,8 +584,9 @@
 
         private static boolean handleNetworkErrors() {
-            boolean condition = !NETWORK_ERRORS.isEmpty();
+            Map<String, Throwable> networkErrors = Main.getNetworkErrors();
+            boolean condition = !networkErrors.isEmpty();
             if (condition) {
                 Set<String> errors = new TreeSet<>();
-                for (Throwable t : NETWORK_ERRORS.values()) {
+                for (Throwable t : networkErrors.values()) {
                     errors.add(t.toString());
                 }
@@ -580,5 +598,5 @@
                                 "It may be due to a missing proxy configuration.<br>" +
                                 "Would you like to change your proxy settings now?",
-                                Utils.joinAsHtmlUnorderedList(NETWORK_ERRORS.keySet()),
+                                Utils.joinAsHtmlUnorderedList(networkErrors.keySet()),
                                 Utils.joinAsHtmlUnorderedList(errors)
                         ));