--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/05/03 13:41:04	701
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/05/11 05:38:18	725
@@ -177,6 +177,13 @@
 			Log.e("StationList", "dismissDialog failed", e);
 		}
 	}
+	public void dismissDialogSafe(Dialog dlg) {
+		try {
+			dlg.dismiss();
+		} catch (Exception e) {
+			Log.e("StationList", "dismissDialog failed", e);
+		}
+	}
 	
 	public void builderShowSafe(AlertDialog.Builder builder) {
 		try {
@@ -304,8 +311,9 @@
 				public void onClick(DialogInterface dialog, int which) {
 					EditText et = (EditText) rootView.findViewById(R.id.EditText);
 					dialog.dismiss();
-					if (et.getText().toString().length() >= 2) {
-						startNameSearch(et.getText().toString());
+					String search = et.getText().toString().trim();
+					if (search.length() >= 2) {
+						startNameSearch(search);
 					} else {
 						showMessageAndClose( getString(stationlist_twocharmin) );
 					}
@@ -511,7 +519,7 @@
 		@Override
 		protected void onPostExecute(Void result) {
 			super.onPostExecute(result);
-			dialog.dismiss();
+			dismissDialogSafe(dialog);
 			
 			
 			if (success) {