--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2009/10/08 20:46:40	425
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2009/10/21 08:43:45	462
@@ -42,6 +42,11 @@
 
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		if (req.getParameter("station") == null) {
+			resp.sendError(400, "not enough parameters");
+			return;
+		}
+		
 		int station = Integer.parseInt( req.getParameter("station") );
 		String format = req.getParameter("format");
 
@@ -51,15 +56,15 @@
 
 		try {
 			beans = fetcher.cachedLookupDepartures(station);
-		} catch (java.net.SocketTimeoutException ste) {
-			logger.warning("Read timed out, station="+station);
+		} catch (java.io.IOException ioe) {
+			logger.warning("Read failed, station="+station + ". " + ioe.getMessage() );
 			resp.sendError(500);
 			return;
 		} catch (CircuitBreakerException cbe) {
 			logger.warning("Circuitbreaker - failing fast");
 			resp.sendError(500);
 			return;
-		} catch (Throwable e) {			
+		} catch (Exception e) {			
 			logger.log(Level.WARNING, "Unknown exception, station=" +station, e);
 			resp.sendError(500);
 			return;