--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/11 14:58:13	982
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/12 16:09:39	990
@@ -19,11 +19,9 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.ListView;
@@ -124,7 +122,10 @@
 				startDepartureFetcher();
 			} else {
 				departures = (DepartureBean) savedInstanceState.getSerializable("departures");
-				adapter.setDepartures(departures.entries);
+				
+				if ( (departures != null) && (departures.entries != null) ) {
+					adapter.setDepartures(departures.entries);
+				}
 				selectedItemId = savedInstanceState.getInt("selectedItemId");
 				
 				if ( hasNotifications() ) {
@@ -210,10 +211,11 @@
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuItem item;
-		item = menu.add(0, MENU_MAP, 0, "Show on map");
+		
+		item = menu.add(0, MENU_MAP, 0, getString(R.string.departurelist_showonmap) );
 		item.setIcon(android.R.drawable.ic_menu_mapmode);
 		
-		item = menu.add(0, MENU_NOTIFICATIONS, 0, "Notifications");
+		item = menu.add(0, MENU_NOTIFICATIONS, 0, getString(R.string.departurelist_notifications) );
 		item.setIcon(android.R.drawable.ic_menu_info_details);