diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
index 7db5b3f7c..19277748d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -95,8 +95,8 @@ public class Query {
 			this.criteria.put(key, criteriaDefinition);
 		} else {
 			throw new InvalidMongoDbApiUsageException(
-					"Due to limitations of the com.mongodb.BasicDBObject, " + "you can't add a second '" + key + "' criteria. "
-							+ "Query already contains '" + serializeToJsonSafely(existing.getCriteriaObject()) + "'.");
+					String.format("Due to limitations of the com.mongodb.BasicDBObject, you can't add a second '%s' criteria. "
+							+ "Query already contains '%s'", key, serializeToJsonSafely(existing.getCriteriaObject())));
 		}
 
 		return this;