diff --git a/src/main/java/org/springframework/data/redis/core/BoundListOperations.java b/src/main/java/org/springframework/data/redis/core/BoundListOperations.java
index 9c429deba..d568600f0 100644
--- a/src/main/java/org/springframework/data/redis/core/BoundListOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/BoundListOperations.java
@@ -231,6 +231,7 @@ public interface BoundListOperations<K, V> extends BoundKeyOperations<K> {
 	 * @since 2.4
 	 * @see <a href="https://redis.io/commands/lpos">Redis Documentation: LPOS</a>
 	 */
+	@Nullable
 	Long indexOf(V value);
 
 	/**
@@ -242,6 +243,7 @@ public interface BoundListOperations<K, V> extends BoundKeyOperations<K> {
 	 * @since 2.4
 	 * @see <a href="https://redis.io/commands/lpos">Redis Documentation: LPOS</a>
 	 */
+	@Nullable
 	Long lastIndexOf(V value);
 
 	/**
diff --git a/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java b/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java
index d8a2af95a..be8344cb7 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/AbstractRedisCollection.java
@@ -131,13 +131,6 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		key = newKey;
 	}
 
-	protected void checkResult(@Nullable Object obj) {
-
-		if (obj == null) {
-			throw new IllegalStateException("Cannot read collection with Redis connection in pipeline/multi-exec mode");
-		}
-	}
-
 	@Override
 	public boolean equals(@Nullable Object o) {
 
@@ -175,4 +168,10 @@ public abstract class AbstractRedisCollection<E> extends AbstractCollection<E> i
 		return sb.toString();
 	}
 
+	protected void checkResult(@Nullable Object obj) {
+
+		if (obj == null) {
+			throw new IllegalStateException("Cannot read collection with Redis connection in pipeline/multi-exec mode");
+		}
+	}
 }
diff --git a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java
index d5cb4659e..93fd9cbed 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java
@@ -187,7 +187,6 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 
 	@Override
 	public String toString() {
-
 		return "RedisStore for key:" + getKey();
 	}
 
@@ -317,17 +316,17 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 		return hashOps.getType();
 	}
 
+	@Override
+	public Cursor<java.util.Map.Entry<K, V>> scan() {
+		return scan(ScanOptions.NONE);
+	}
+
 	private void checkResult(@Nullable Object obj) {
 		if (obj == null) {
 			throw new IllegalStateException("Cannot read collection with Redis connection in pipeline/multi-exec mode");
 		}
 	}
 
-	@Override
-	public Cursor<java.util.Map.Entry<K, V>> scan() {
-		return scan(ScanOptions.NONE);
-	}
-
 	/**
 	 * @since 1.4
 	 * @param options