Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 8652)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 8653)
@@ -193,6 +193,8 @@
                 }
 
-                for (ImageEntry ie : yLayer.data) {
-                    ie.applyTmp();
+                if (yLayer.data != null) {
+                    for (ImageEntry ie : yLayer.data) {
+                        ie.applyTmp();
+                    }
                 }