Index: trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java	(revision 18068)
+++ trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java	(revision 18069)
@@ -556,5 +556,5 @@
                 result.add(((GpxLayer) layer).data);
             } else if (layer instanceof GeoImageLayer) {
-                result.add(((GeoImageLayer) layer).getFauxGpxLayer().data);
+                result.add(((GeoImageLayer) layer).getFauxGpxData());
             }
         }
Index: trunk/src/org/openstreetmap/josm/io/IGpxReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/IGpxReader.java	(revision 18068)
+++ trunk/src/org/openstreetmap/josm/io/IGpxReader.java	(revision 18069)
@@ -5,8 +5,9 @@
 
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.io.rtklib.RtkLibPosReader;
 import org.xml.sax.SAXException;
 
 /**
- * Abstraction of {@code GpxReader} and {@code NmeaReader}.
+ * Abstraction of {@code GpxReader}, {@code NmeaReader} and {@link RtkLibPosReader}
  * @since 14010
  */
Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java	(revision 18068)
+++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java	(revision 18069)
@@ -12,4 +12,5 @@
 import javax.swing.SwingConstants;
 
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
@@ -35,8 +36,6 @@
     @Override
     public Collection<Layer> getDependencies() {
-        if (layer.getGpxLayer() != null)
-            return Collections.singleton((Layer) layer.getGpxLayer());
-        else
-            return Collections.emptySet();
+        GpxLayer gpxLayer = layer.getGpxLayer();
+        return gpxLayer != null ? Collections.singleton(gpxLayer) : Collections.emptySet();
     }