diff --git a/src/main/java/org/springframework/data/domain/Chunk.java b/src/main/java/org/springframework/data/domain/Chunk.java
index 8e6c0c037..00267e349 100644
--- a/src/main/java/org/springframework/data/domain/Chunk.java
+++ b/src/main/java/org/springframework/data/domain/Chunk.java
@@ -49,6 +49,7 @@ abstract class Chunk<T> implements Slice<T>, Serializable {
 	public Chunk(List<T> content, Pageable pageable) {
 
 		Assert.notNull(content, "Content must not be null!");
+		Assert.notNull(pageable, "Pageable must not be null!");
 
 		this.content.addAll(content);
 		this.pageable = pageable;
diff --git a/src/main/java/org/springframework/data/domain/PageImpl.java b/src/main/java/org/springframework/data/domain/PageImpl.java
index 58b7f08df..9c1970df9 100644
--- a/src/main/java/org/springframework/data/domain/PageImpl.java
+++ b/src/main/java/org/springframework/data/domain/PageImpl.java
@@ -16,7 +16,6 @@
 package org.springframework.data.domain;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Function;
 
 /**
@@ -45,10 +44,7 @@ public class PageImpl<T> extends Chunk<T> implements Page<T> {
 		super(content, pageable);
 
 		this.pageable = pageable;
-
-		Optional<Pageable> foo = pageable.isPaged() ? Optional.of(pageable) : Optional.empty();
-
-		this.total = foo.filter(it -> !content.isEmpty())//
+		this.total = pageable.toOptional().filter(it -> !content.isEmpty())//
 				.filter(it -> it.getOffset() + it.getPageSize() > total)//
 				.map(it -> it.getOffset() + content.size())//
 				.orElse(total);