Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java	(revision 14794)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java	(revision 14797)
@@ -176,11 +176,13 @@
     }
 
-    private static Double getElevation(WayPoint wp) {
-        String value = wp.getString(GpxConstants.PT_ELE);
-        if (value != null && !value.isEmpty()) {
-            try {
-                return Double.valueOf(value);
-            } catch (NumberFormatException e) {
-                Logging.warn(e);
+    static Double getElevation(WayPoint wp) {
+        if (wp != null) {
+            String value = wp.getString(GpxConstants.PT_ELE);
+            if (value != null && !value.isEmpty()) {
+                try {
+                    return Double.valueOf(value);
+                } catch (NumberFormatException e) {
+                    Logging.warn(e);
+                }
             }
         }