diff --git a/trunk/siprp/importer/DataChooserWindow.java b/trunk/siprp/importer/DataChooserWindow.java
index cbcfcf4e..5d5b6c3a 100644
--- a/trunk/siprp/importer/DataChooserWindow.java
+++ b/trunk/siprp/importer/DataChooserWindow.java
@@ -77,11 +77,11 @@ public class DataChooserWindow extends CustomJDialog
 			int index;
 			if( preselected == null )
 			{
-				index = Math.min( i, items.length );
+				index = Math.min( i, items.length - 1 );
 			}
 			else
 			{
-				index = Math.min( preselected[ i ], items.length );
+				index = Math.min( preselected[ i ], items.length - 1 );
 			}
 			combo.setSelectedIndex( index );
 			combos[ i ] = combo;