--- android/TrainInfo/src/dk/thoerup/traininfo/provider/OfflineStationProvider.java	2011/08/31 20:23:36	1594
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/OfflineStationProvider.java	2011/08/31 20:32:50	1595
@@ -154,7 +154,7 @@
 		Collections.sort( entries, distanceComparator);
 		
 		StationBean tmpStations = new StationBean();
-		for (int i = 0; i<8; i++) {
+		for (int i = 0; i<8 && i<entries.size(); i++) {
 			tmpStations.entries.add( entries.get(i) );
 		}