Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 15757)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 15759)
@@ -202,11 +202,7 @@
             for (IGpxTrack trk : data.getTracks()) {
                 info.append("<tr><td>");
-                if (trk.getAttributes().containsKey(GpxConstants.GPX_NAME)) {
-                    info.append(trk.get(GpxConstants.GPX_NAME));
-                }
+                info.append(trk.getAttributes().getOrDefault(GpxConstants.GPX_NAME, ""));
                 info.append("</td><td>");
-                if (trk.getAttributes().containsKey(GpxConstants.GPX_DESC)) {
-                    info.append(' ').append(trk.get(GpxConstants.GPX_DESC));
-                }
+                info.append(trk.getAttributes().getOrDefault(GpxConstants.GPX_DESC, ""));
                 info.append("</td><td>");
                 info.append(getTimespanForTrack(trk));