diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index c6a34507..ddc5f59b 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -448,10 +448,10 @@ public final class BahnProvider implements NetworkProvider
 			+ "delay=\"(?:-|k\\.A\\.?|cancel|\\+?\\s*(\\d+))\" \n" // delay
 			+ "(?:platform =\"([^\"]*)\" \n)?" // position
 			+ "(?:newpl =\"([^\"]*)\" \n)?" //
-			+ "targetLoc=\"([^\"]*)\" \n" // destination
+			+ "targetLoc=\"(.*?)\" \n" // destination
 			+ "prod=\"([^\"]*)\" \n" // line
 			+ "(?:dir=[^\n]*\n)?" // (destination)
-			+ "(?:depStation=\"([^\"]*)\"\n)?" //
+			+ "(?:depStation=\"(.*?)\"\n)?" //
 			+ "delayReason=\"([^\"]*)\"\n" // message
 	);
 	private static final Pattern P_DEPARTURES_MESSAGES = Pattern.compile("<Err code=\"([^\"]*)\" text=\"([^\"]*)\"");
@@ -530,9 +530,12 @@ public final class BahnProvider implements NetworkProvider
 		// ARZ29177
 		// ARZ29178
 
-		if (line == null || line.length() == 0)
+		if (line == null)
 			return null;
 
+		if (line.length() == 0)
+			return "?";
+
 		if (line.equals("---"))
 			return "?---";