--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2009/10/08 20:46:40	425
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2009/10/21 08:43:45	462
@@ -25,6 +25,11 @@
 	
 	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		if (request.getParameter("train") == null) {
+			response.sendError(400, "not enough parameters");
+			return;
+		}
+		
 		String train = request.getParameter("train").trim();
 		
 		String sections[] = train.split(" ");
@@ -43,13 +48,13 @@
 		
 			response.setContentType("text/xml");
 			response.getWriter().print(responseXML);
-		} catch (java.net.SocketTimeoutException ste) {
-			logger.warning("(timetable) Read timed out, train="+train);
+		} catch (java.io.IOException ioe) {
+			logger.warning("(timetable) Read failed, train="+train + ". " + ioe.getMessage());
 			response.sendError(500, "Backend timed out");
 		} catch (CircuitBreakerException cbe) {
 			logger.warning("Circuitbreaker - failing fast");
 			response.sendError(500);
-		}catch (Throwable e) {
+		}catch (Exception e) {
 			logger.log(Level.WARNING, "failure looking up timetable: train=" +train, e);
 			response.sendError(500);
 		}