diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java
index e30ed5d6e..9b3be2d7f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java
@@ -79,7 +79,7 @@ public class GeoJsonMultiPoint implements GeoJson<Iterable<Point>> {
 		Assert.notNull(second, "Second point must not be null");
 		Assert.notNull(others, "Additional points must not be null");
 
-		this.points = new ArrayList<>();
+		this.points = new ArrayList<>(2 + others.length);
 		this.points.add(first);
 		this.points.add(second);
 		this.points.addAll(Arrays.asList(others));
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java
index 990be290c..f5d52232d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java
@@ -130,7 +130,13 @@ public class GeoJsonPolygon extends Polygon implements GeoJson<List<GeoJsonLineS
 
 	private static List<Point> asList(Point first, Point second, Point third, Point fourth, Point... others) {
 
-		ArrayList<Point> result = new ArrayList<Point>(3 + others.length);
+		Assert.notNull(first, "First point must not be null");
+		Assert.notNull(second, "Second point must not be null");
+		Assert.notNull(third, "Third point must not be null");
+		Assert.notNull(fourth, "Fourth point must not be null");
+		Assert.notNull(others, "Additional points must not be null");
+
+		ArrayList<Point> result = new ArrayList<Point>(4 + others.length);
 
 		result.add(first);
 		result.add(second);