diff --git a/enabler/src/de/schildbach/pte/dto/Location.java b/enabler/src/de/schildbach/pte/dto/Location.java
index 5d9e2680..aa395928 100644
--- a/enabler/src/de/schildbach/pte/dto/Location.java
+++ b/enabler/src/de/schildbach/pte/dto/Location.java
@@ -123,7 +123,7 @@ public final class Location implements Serializable
 
 	public final String uniqueShortName()
 	{
-		if (name != null && Arrays.binarySearch(NON_UNIQUE_NAMES, name) >= 0)
+		if (place != null && name != null && Arrays.binarySearch(NON_UNIQUE_NAMES, name) >= 0)
 			return place + ", " + name;
 		else if (name != null)
 			return name;