diff --git a/trunk/siprp/importer/DataChooserWindow.java b/trunk/siprp/importer/DataChooserWindow.java
index 5d5b6c3a..9619074e 100644
--- a/trunk/siprp/importer/DataChooserWindow.java
+++ b/trunk/siprp/importer/DataChooserWindow.java
@@ -81,7 +81,19 @@ public class DataChooserWindow extends CustomJDialog
 			}
 			else
 			{
-				index = Math.min( preselected[ i ], items.length - 1 );
+				if( i < preselected.length )
+				{
+					index = Math.min( preselected[ i ], items.length - 1 );
+					if( index == -1 )
+					{
+						index = items.length - 1;
+					}
+				}
+				else
+				{
+					index = items.length - 1;
+				}
+				
 			}
 			combo.setSelectedIndex( index );
 			combos[ i ] = combo;