Index: /trunk/src/org/openstreetmap/josm/io/GpxImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxImporter.java	(revision 2234)
+++ /trunk/src/org/openstreetmap/josm/io/GpxImporter.java	(revision 2235)
@@ -53,6 +53,8 @@
             Runnable task = new Runnable() {
                 public void run() {
-                    Main.main.addLayer(gpxLayer);
-                    if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+                    if (!r.data.tracks.isEmpty() || ! r.data.routes.isEmpty()) {
+                        Main.main.addLayer(gpxLayer);
+                    }
+                    if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.data.waypoints.isEmpty()) {
                         MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer);
                         if (ml.data.size() > 0) {