Index: /trunk/src/org/openstreetmap/josm/data/ImageData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/ImageData.java	(revision 18062)
+++ /trunk/src/org/openstreetmap/josm/data/ImageData.java	(revision 18063)
@@ -129,5 +129,5 @@
      */
     public List<ImageEntry> getSelectedImages() {
-        return selectedImagesIndex.stream().filter(i -> i > -1).map(data::get).collect(Collectors.toList());
+        return selectedImagesIndex.stream().filter(i -> i > -1 && i < data.size()).map(data::get).collect(Collectors.toList());
     }