Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 5367)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 5368)
@@ -811,4 +811,5 @@
             @Override
             public void setValueAt(Object o, int row, int column) {
+                if (layerInfo.getLayers().size() <= row) return;
                 ImageryInfo info = layerInfo.getLayers().get(row);
                 switch (column) {