Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java	(revision 35978)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java	(revision 36239)
@@ -77,11 +77,11 @@
 
         // no HGT, check for elevation data in GPX
-        if (!wpt.attr.containsKey(HEIGHT_ATTRIBUTE)) {
+        // Parse elevation from GPX data
+        String height = wpt.getString(HEIGHT_ATTRIBUTE);
+        if (height == null) {
             // GPX has no elevation data :-(
             return NO_ELEVATION;
         }
 
-        // Parse elevation from GPX data
-        String height = wpt.getString(ElevationHelper.HEIGHT_ATTRIBUTE);
         try {
             return Double.parseDouble(height);