Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 14175)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 14176)
@@ -106,4 +106,5 @@
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
 import org.openstreetmap.josm.gui.bugreport.BugReportDialog;
+import org.openstreetmap.josm.gui.bugreport.DefaultBugReportSendingHandler;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.io.CredentialDialog;
@@ -776,5 +777,5 @@
         if (!GraphicsEnvironment.isHeadless()) {
             BugReportQueue.getInstance().setBugReportHandler(BugReportDialog::showFor);
-            BugReportSender.setBugReportSendingHandler(BugReportDialog.bugReportSendingHandler);
+            BugReportSender.setBugReportSendingHandler(new DefaultBugReportSendingHandler());
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java	(revision 14175)
+++ /trunk/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java	(revision 14176)
@@ -18,5 +18,4 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
@@ -33,9 +32,7 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
-import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportQueue.SuppressionMode;
 import org.openstreetmap.josm.tools.bugreport.BugReportSender;
-import org.openstreetmap.josm.tools.bugreport.BugReportSender.BugReportSendingHandler;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
@@ -55,31 +52,4 @@
     private JCheckBox cbSuppressSingle;
     private JCheckBox cbSuppressAll;
-
-    /**
-     * Default bug report callback that opens the bug report form in user browser
-     * and displays a dialog in case of error.
-     * @since 12790
-     */
-    public static final BugReportSendingHandler bugReportSendingHandler = new BugReportSendingHandler() {
-        @Override
-        public String sendingBugReport(String bugUrl, String statusText) {
-            return OpenBrowser.displayUrl(bugUrl);
-        }
-
-        @Override
-        public void failed(String errorMessage, String statusText) {
-            SwingUtilities.invokeLater(() -> {
-                JPanel errorPanel = new JPanel(new GridBagLayout());
-                errorPanel.add(new JMultilineLabel(
-                        tr("Opening the bug report failed. Please report manually using this website:")),
-                        GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-                errorPanel.add(new UrlLabel(Config.getUrls().getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-                errorPanel.add(new DebugTextDisplay(statusText));
-
-                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), errorPanel, tr("You have encountered a bug in JOSM"),
-                        JOptionPane.ERROR_MESSAGE);
-            });
-        }
-    };
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/bugreport/DefaultBugReportSendingHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/bugreport/DefaultBugReportSendingHandler.java	(revision 14176)
+++ /trunk/src/org/openstreetmap/josm/gui/bugreport/DefaultBugReportSendingHandler.java	(revision 14176)
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.bugreport;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.bugreport.BugReportSender.BugReportSendingHandler;
+
+/**
+ * Default bug report callback that opens the bug report form in user browser
+ * and displays a dialog in case of error.
+ * @since 14176
+ */
+public class DefaultBugReportSendingHandler implements BugReportSendingHandler {
+
+    @Override
+    public String sendingBugReport(String bugUrl, String statusText) {
+        return OpenBrowser.displayUrl(bugUrl);
+    }
+
+    @Override
+    public void failed(String errorMessage, String statusText) {
+        SwingUtilities.invokeLater(() -> {
+            JPanel errorPanel = new JPanel(new GridBagLayout());
+            errorPanel.add(new JMultilineLabel(
+                    tr("Opening the bug report failed. Please report manually using this website:")),
+                    GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+            errorPanel.add(new UrlLabel(Config.getUrls().getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
+            errorPanel.add(new DebugTextDisplay(statusText));
+
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), errorPanel, tr("You have encountered a bug in JOSM"),
+                    JOptionPane.ERROR_MESSAGE);
+        });
+    }
+}