diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java
index e46d98305..d1939a423 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java
@@ -175,9 +175,12 @@ class EntityOperations {
 		}
 
 		MongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(entityClass);
-		if(persistentEntity == null) {
-			throw new MappingException(String.format("Collection name cannot be derived for type %s. Is it a store native type?", entityClass));
+
+		if (persistentEntity == null) {
+			throw new MappingException(String.format(
+					"Cannot determine collection name from type '%s'. Is it a store native type?", entityClass.getName()));
 		}
+
 		return persistentEntity.getCollection();
 	}