--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/09/29 23:05:14	1144
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2010/10/01 05:30:32	1145
@@ -25,6 +25,7 @@
 
 import dk.thoerup.android.traininfo.common.DepartureBean;
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
+import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
 
 /**
@@ -98,6 +99,11 @@
 			Statistics.getInstance().incrementDepartureErrors();
 			resp.sendError(500);
 			return;
+		} catch (StationDAO.NostationException nse) {
+			logger.log(Level.WARNING, "Station not in Database, station=" +station);
+			Statistics.getInstance().incrementDepartureErrors();
+			resp.sendError(400, "invalid station ID");
+			return;			
 		} catch (Exception e) {			
 			logger.log(Level.WARNING, "Unknown exception, station=" +station, e);
 			Statistics.getInstance().incrementDepartureErrors();