Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java	(revision 10163)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java	(revision 10164)
@@ -149,8 +149,5 @@
             ids.add(cs.getId());
         }
-        if (parent == null)
-            return new ChangesetHeaderDownloadTask(ids);
-        else
-            return new ChangesetHeaderDownloadTask(parent, ids);
+        return new ChangesetHeaderDownloadTask(parent, ids);
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 10163)
+++ trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 10164)
@@ -16,4 +16,5 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
+import java.awt.HeadlessException;
 import java.awt.Image;
 import java.awt.Stroke;
@@ -522,8 +523,12 @@
      */
     public static Frame getFrameForComponent(Component parentComponent) {
-        if (parentComponent == null && GraphicsEnvironment.isHeadless()) {
+        try {
+            return JOptionPane.getFrameForComponent(parentComponent);
+        } catch (HeadlessException e) {
+            if (Main.isDebugEnabled()) {
+                Main.debug(e.getMessage());
+            }
             return null;
         }
-        return JOptionPane.getFrameForComponent(parentComponent);
     }
 }