diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index 91348dcf..9adbdb60 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -518,10 +518,10 @@ public final class BahnProvider extends AbstractHafasProvider
 
 					final String line = normalizeLine(ParserUtils.resolveEntities(mDepFine.group(7)));
 
-					final String message = ParserUtils.resolveEntities(mDepFine.group(9));
+					final String message = ParserUtils.resolveEntities(mDepFine.group(9)).trim();
 
 					departures.add(new Departure(plannedTime.getTime(), predictedTime != null ? predictedTime.getTime() : null, line,
-							line != null ? lineColors(line) : null, null, position, 0, destination, message));
+							line != null ? lineColors(line) : null, null, position, 0, destination, message.length() > 0 ? message : null));
 				}
 			}
 			else