--- android/TrainInfoService/src/dk/thoerup/traininfoservice/DBConnection.java	2010/02/05 19:28:36	586
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/DBConnection.java	2010/02/08 18:42:00	587
@@ -9,10 +9,14 @@
 import javax.sql.DataSource;
 
 public class DBConnection {
-	public static Connection getConnection() throws SQLException, NamingException{
-		Context ctx = new InitialContext();
-		DataSource ds = (DataSource) ctx.lookup("java:comp/env/jdbc/android");
-		return ds.getConnection();
+	public static Connection getConnection() throws SQLException{
+		try {
+			Context ctx = new InitialContext();
+			DataSource ds = (DataSource) ctx.lookup("java:comp/env/jdbc/android");
+			return ds.getConnection();
+		} catch (NamingException e) {
+			throw new SQLException("invalid data source", e);
+		}
 	}
 }