--- android/TrainInfo/src/dk/thoerup/traininfo/LocationLookup.java	2010/01/29 08:43:52	569
+++ android/TrainInfo/src/dk/thoerup/traininfo/LocationLookup.java	2010/01/29 12:34:17	570
@@ -57,8 +57,10 @@
 				if (provider.equalsIgnoreCase("gps"))
 					hasGps = true;
 				locManager.requestLocationUpdates(provider, 0, 0, this);
-				
-				saveLastKnownLocation(locManager.getLastKnownLocation(provider));
+				Location tmpLastKnown = locManager.getLastKnownLocation(provider);
+				if (tmpLastKnown != null) {
+					saveLastKnownLocation(tmpLastKnown);
+				}
 			}
 		} else {
 			// message that no suitable provider was found