diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java
index a61f5083f21..17f88396154 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java
@@ -33,7 +33,10 @@ abstract class LocationAdapter<T> {
 	public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {
 		@Override
 		public String extractName(IPath location) {
-			return location.lastSegment();
+			String name = location.lastSegment();
+			if (name != null)
+				return name;
+			return location.toString();
 		}
 
 		@Override