Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 18193)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 18194)
@@ -26,4 +26,5 @@
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
@@ -287,7 +288,9 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            supportLayer = new CorrelationSupportLayer(yLayer.getFauxGpxData());
-            supportLayer.getGpxData().addChangeListener(statusBarUpdaterWithRepaint);
-            MainApplication.getLayerManager().addLayer(supportLayer);
+            Optional.ofNullable(selectedGPX(true)).ifPresent(gpx -> {
+                supportLayer = new CorrelationSupportLayer(gpx.data);
+                supportLayer.getGpxData().addChangeListener(statusBarUpdaterWithRepaint);
+                MainApplication.getLayerManager().addLayer(supportLayer);
+            });
         }
     }