diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index 687d80af..2cb2671a 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -17,10 +17,8 @@
 
 package de.schildbach.pte;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -113,10 +111,6 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 		{
 			throw new RuntimeException(x);
 		}
-		catch (final SocketTimeoutException x)
-		{
-			throw new RuntimeException(x);
-		}
 		finally
 		{
 			if (is != null)
@@ -289,13 +283,13 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 					stations.add(ownStation);
 
 				if (maxStations == 0 || maxStations >= stations.size())
-					return new NearbyStationsResult(uri, stations);
+					return new NearbyStationsResult(stations);
 				else
-					return new NearbyStationsResult(uri, stations.subList(0, maxStations));
+					return new NearbyStationsResult(stations.subList(0, maxStations));
 			}
 			else if ("notidentified".equals(nameState))
 			{
-				return new NearbyStationsResult(uri, NearbyStationsResult.Status.INVALID_STATION);
+				return new NearbyStationsResult(NearbyStationsResult.Status.INVALID_STATION);
 			}
 			else
 			{
@@ -306,14 +300,6 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 		{
 			throw new RuntimeException(x);
 		}
-		catch (final FileNotFoundException x)
-		{
-			return new NearbyStationsResult(uri, NearbyStationsResult.Status.SERVICE_DOWN);
-		}
-		catch (final SocketTimeoutException x)
-		{
-			return new NearbyStationsResult(uri, NearbyStationsResult.Status.SERVICE_DOWN);
-		}
 		finally
 		{
 			if (is != null)
@@ -792,14 +778,6 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 		{
 			throw new RuntimeException(x);
 		}
-		catch (final FileNotFoundException x)
-		{
-			return new QueryDeparturesResult(QueryDeparturesResult.Status.SERVICE_DOWN, Integer.parseInt(stationId));
-		}
-		catch (final SocketTimeoutException x)
-		{
-			return new QueryDeparturesResult(QueryDeparturesResult.Status.SERVICE_DOWN, Integer.parseInt(stationId));
-		}
 		finally
 		{
 			if (is != null)
@@ -855,10 +833,6 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 			is = ParserUtils.scrapeInputStream(uri);
 			return queryConnections(uri, is);
 		}
-		catch (final SocketTimeoutException x)
-		{
-			return new QueryConnectionsResult(QueryConnectionsResult.Status.SERVICE_DOWN);
-		}
 		finally
 		{
 			if (is != null)
@@ -874,10 +848,6 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 			is = ParserUtils.scrapeInputStream(uri);
 			return queryConnections(uri, is);
 		}
-		catch (final SocketTimeoutException x)
-		{
-			return new QueryConnectionsResult(QueryConnectionsResult.Status.SERVICE_DOWN);
-		}
 		finally
 		{
 			if (is != null)
diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index dcd8b98d..9115b1e2 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -19,7 +19,6 @@ package de.schildbach.pte;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -178,10 +177,6 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 		{
 			throw new RuntimeException(x);
 		}
-		catch (final SocketTimeoutException x)
-		{
-			throw new RuntimeException(x);
-		}
 		finally
 		{
 			if (is != null)
@@ -254,6 +249,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 		final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
 
 		InputStream is = null;
+
 		try
 		{
 			is = ParserUtils.scrapeInputStream(apiUri, wrap(request));
@@ -479,10 +475,6 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 		{
 			throw new RuntimeException(x);
 		}
-		catch (final SocketTimeoutException x)
-		{
-			throw new RuntimeException(x);
-		}
 		catch (final ParseException x)
 		{
 			throw new RuntimeException(x);
@@ -770,9 +762,9 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 		}
 
 		if (maxStations == 0 || maxStations >= stations.size())
-			return new NearbyStationsResult(uri, stations);
+			return new NearbyStationsResult(stations);
 		else
-			return new NearbyStationsResult(uri, stations.subList(0, maxStations));
+			return new NearbyStationsResult(stations.subList(0, maxStations));
 	}
 
 	protected static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zÄÖÜäöüßáàâéèêíìîóòôúùû/-]+)[\\s-]*(.*)");
diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index c8965644..4948bc52 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -125,9 +125,9 @@ public final class BahnProvider extends AbstractHafasProvider
 		}
 
 		if (maxStations == 0 || maxStations >= stations.size())
-			return new NearbyStationsResult(uri, stations);
+			return new NearbyStationsResult(stations);
 		else
-			return new NearbyStationsResult(uri, stations.subList(0, maxStations));
+			return new NearbyStationsResult(stations.subList(0, maxStations));
 	}
 
 	private String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep)
diff --git a/src/de/schildbach/pte/MvvProvider.java b/src/de/schildbach/pte/MvvProvider.java
index 4699a531..3003ea08 100644
--- a/src/de/schildbach/pte/MvvProvider.java
+++ b/src/de/schildbach/pte/MvvProvider.java
@@ -119,9 +119,9 @@ public class MvvProvider extends AbstractEfaProvider
 		}
 
 		if (maxStations == 0 || maxStations >= stations.size())
-			return new NearbyStationsResult(uri, stations);
+			return new NearbyStationsResult(stations);
 		else
-			return new NearbyStationsResult(uri, stations.subList(0, maxStations));
+			return new NearbyStationsResult(stations.subList(0, maxStations));
 	}
 
 	@Override
diff --git a/src/de/schildbach/pte/dto/NearbyStationsResult.java b/src/de/schildbach/pte/dto/NearbyStationsResult.java
index 7b23d146..d07a80fa 100644
--- a/src/de/schildbach/pte/dto/NearbyStationsResult.java
+++ b/src/de/schildbach/pte/dto/NearbyStationsResult.java
@@ -29,20 +29,17 @@ public final class NearbyStationsResult
 		OK, INVALID_STATION, SERVICE_DOWN
 	}
 
-	public final String uri;
 	public final Status status;
 	public final List<Station> stations;
 
-	public NearbyStationsResult(final String uri, List<Station> stations)
+	public NearbyStationsResult(final List<Station> stations)
 	{
-		this.uri = uri;
 		this.status = Status.OK;
 		this.stations = stations;
 	}
 
-	public NearbyStationsResult(final String uri, final Status status)
+	public NearbyStationsResult(final Status status)
 	{
-		this.uri = uri;
 		this.status = status;
 		this.stations = null;
 	}