diff --git a/src/main/java/org/springframework/data/mapping/PersistentEntity.java b/src/main/java/org/springframework/data/mapping/PersistentEntity.java
index 622996118..44444628c 100644
--- a/src/main/java/org/springframework/data/mapping/PersistentEntity.java
+++ b/src/main/java/org/springframework/data/mapping/PersistentEntity.java
@@ -151,7 +151,7 @@ public interface PersistentEntity<T, P extends PersistentProperty<P>> extends It
 			return property;
 		}
 
-		throw new IllegalStateException(String.format("Required identifier property not found for %s!", getType()));
+		throw new IllegalStateException(String.format("Required property %s not found for %s!", name, getType()));
 	}
 
 	/**
diff --git a/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java b/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java
index 33e23e281..69ffd9176 100755
--- a/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/model/BasicPersistentEntityUnitTests.java
@@ -165,6 +165,16 @@ public class BasicPersistentEntityUnitTests<T extends PersistentProperty<T>> {
 		assertThat(entity.getPersistentProperty(CreatedDate.class)).isNull();
 	}
 
+	@Test // DATACMNS-1122
+	public void reportsRequiredPropertyName() {
+
+		SampleMappingContext context = new SampleMappingContext();
+		PersistentEntity<Object, SamplePersistentProperty> entity = context.getRequiredPersistentEntity(Entity.class);
+
+		assertThatThrownBy(() -> entity.getRequiredPersistentProperty("foo"))
+				.hasMessageContaining("Required property foo not found");
+	}
+
 	@Test // DATACMNS-596
 	public void returnsBeanWrapperForPropertyAccessor() {