diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml
index 56c556b58..3261040c1 100644
--- a/spring-data-mongodb-parent/pom.xml
+++ b/spring-data-mongodb-parent/pom.xml
@@ -187,6 +187,9 @@
**/*Tests.java
+
+ **/PerformanceTests.java
+
junit:junit
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 48342b594..6400d7567 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -148,6 +148,29 @@
+
+
+ performance-tests
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.8
+
+
+ **/PerformanceTests.java
+
+
+ none
+
+
+
+
+
+
+
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
index 0bdbf9364..3bc7876d9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
@@ -720,20 +720,24 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
Assert.notNull(targetType);
+ if (sourceValue.isEmpty()) {
+ return Collections.emptySet();
+ }
+
Class> collectionType = targetType.getType();
collectionType = Collection.class.isAssignableFrom(collectionType) ? collectionType : List.class;
Collection