--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2012/04/16 14:19:48	1797
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2012/04/18 17:38:54	1798
@@ -264,7 +264,11 @@
 				startMetroFetcher();
 			} else {
 				metroBean = (MetroBean) savedInstanceState.getSerializable("metro");
-				loadMetroData();
+				if (metroBean != null) { // Avoid reported NPE
+					loadMetroData();
+				} else {
+					startMetroFetcher();	
+				}
 			}
 			
 		} else {