diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index 14aa1cc..6b5b38d 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -1,5 +1,5 @@
 = Spring Data R2DBC - Reference Documentation
- Mark Paluch, Jay Bryant
+ Mark Paluch, Jay Bryant, Stephen Cohen
 :revnumber: {version}
 :revdate: {localdate}
 ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]]
diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java b/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java
index 8d677cd..95bfb88 100644
--- a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java
+++ b/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java
@@ -81,7 +81,7 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 			R2dbcConverter converter, ReactiveDataAccessStrategy accessStrategy) {
 
 		this.entity = entity;
-		this.entityOperations = new R2dbcEntityTemplate(databaseClient);
+		this.entityOperations = new R2dbcEntityTemplate(databaseClient, accessStrategy);
 		this.idProperty = Lazy.of(() -> converter //
 				.getMappingContext() //
 				.getRequiredPersistentEntity(this.entity.getJavaType()) //
@@ -179,6 +179,9 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveSortingRepository<T
 	 */
 	@Override
 	public Flux<T> findAll(Sort sort) {
+
+		Assert.notNull(sort, "Sort must not be null!");
+
 		return this.entityOperations.select(Query.empty().sort(sort), this.entity.getJavaType());
 	}