Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 8903)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java	(revision 8904)
@@ -146,9 +146,13 @@
             if (layer == null) return null;
             if (newLayer || mergeLayer == null) {
-                Main.main.addLayer(layer);
+                if (Main.main != null) {
+                    Main.main.addLayer(layer);
+                }
                 return layer;
             } else {
                 mergeLayer.mergeFrom(layer);
-                Main.map.repaint();
+                if (Main.map != null) {
+                    Main.map.repaint();
+                }
                 return mergeLayer;
             }
@@ -179,5 +183,6 @@
         }
 
-        @Override protected void cancel() {
+        @Override
+        protected void cancel() {
             setCanceled(true);
             if (reader != null) {