Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java	(revision 15152)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java	(revision 15153)
@@ -535,5 +535,5 @@
             outer:
             for (int line : lines) {
-                ImageryInfo info = defaultModel.getRow(line);
+                ImageryInfo info = defaultModel.getRow(defaultTable.convertRowIndexToModel(line));
 
                 // Check if an entry with exactly the same values already exists
Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java	(revision 15152)
+++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTaskTest.java	(revision 15153)
@@ -42,5 +42,5 @@
      * Unit test of {@code ChangesetHeaderDownloadTask#buildTaskForChangesets} - null parent.
      */
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testBuildTaskForChangesetsNullParent() {
         ChangesetHeaderDownloadTask.buildTaskForChangesets(Collections.singleton(new Changeset(1)));