diff --git a/enabler/src/de/schildbach/pte/dto/Location.java b/enabler/src/de/schildbach/pte/dto/Location.java
index f8cb35da..0a7871d0 100644
--- a/enabler/src/de/schildbach/pte/dto/Location.java
+++ b/enabler/src/de/schildbach/pte/dto/Location.java
@@ -96,8 +96,12 @@ public final class Location implements Serializable
 	{
 		if ("Hauptbahnhof".equals(name) || "Hbf".equals(name) || "Bahnhof".equals(name) || "Dorf".equals(name) || "Kirche".equals(name))
 			return place + ", " + name;
-		else
+		else if (name != null)
 			return name;
+		else if (hasId())
+			return Integer.toString(id);
+		else
+			return null;
 	}
 
 	@Override