diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
index 466caafe7..d0075c247 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
@@ -434,7 +434,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
 
 	private Collection<Clause> getWhereClauses(MapId id, CassandraPersistentEntity<?> entity) {
 
-		Assert.notNull("MapId must not be null");
+		Assert.notNull(id, "MapId must not be null");
 
 		Collection<Clause> clauses = new ArrayList<Clause>();