diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index 2adefbedb..2d0949221 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -6,8 +6,9 @@ New and noteworthy in the latest releases.
 [[new-in-2.1.0]]
 == New in Spring Data Redis 2.1
 
-* Unix domain socket connections.
+* Unix domain socket connections using <<redis:connectors:lettuce,Lettuce>>.
 
+[[new-in-2.0.0]]
 == New in Spring Data Redis 2.0
 
 * Upgrade to Java 8.
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java
index 919ad4532..f49b6f6f0 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java
@@ -18,10 +18,11 @@ package org.springframework.data.redis.connection;
 import org.springframework.util.Assert;
 
 /**
- * Configuration class used for setting up {@link RedisConnection} via {@link RedisConnectionFactory} by connecting to a
- * single node <a href="http://redis.io/">Redis</a> using a local unix domain socket.
+ * Configuration class used for setting up {@link RedisConnection} via {@link RedisConnectionFactory} connecting to
+ * single <a href="http://redis.io/">Redis</a> using a local unix domain socket.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 2.1
  */
 public class RedisSocketConfiguration {
@@ -44,7 +45,7 @@ public class RedisSocketConfiguration {
 	 */
 	public RedisSocketConfiguration(String socket) {
 
-		Assert.hasText(socket, "Socket path must not be null or empty!");
+		Assert.hasText(socket, "Socket path must not be null nor empty!");
 
 		this.socket = socket;
 	}
@@ -60,6 +61,8 @@ public class RedisSocketConfiguration {
 	 * @param socket path to the Redis socket.
 	 */
 	public void setSocket(String socket) {
+
+		Assert.hasText(socket, "Socket must not be null nor empty!");
 		this.socket = socket;
 	}
 
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
index 0d9683662..26a32b01a 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
@@ -794,7 +794,7 @@ public class LettuceConnectionFactory
 	}
 
 	/**
-	 * @return the {@link RedisSocketConfiguration}.
+	 * @return the {@link RedisSocketConfiguration} or {@literal null} if not set.
 	 * @since 2.1
 	 */
 	@Nullable
@@ -939,6 +939,7 @@ public class LettuceConnectionFactory
 
 		RedisURI uri = isDomainSocketAware() ? createRedisSocketURIAndApplySettings(socketConfiguration.getSocket())
 				: createRedisURIAndApplySettings(getHostName(), getPort());
+
 		RedisClient redisClient = clientConfiguration.getClientResources() //
 				.map(clientResources -> RedisClient.create(clientResources, uri)) //
 				.orElseGet(() -> RedisClient.create(uri));
diff --git a/src/test/java/org/springframework/data/redis/SettingsUtils.java b/src/test/java/org/springframework/data/redis/SettingsUtils.java
index 1d39a9f5e..cc082d3e1 100644
--- a/src/test/java/org/springframework/data/redis/SettingsUtils.java
+++ b/src/test/java/org/springframework/data/redis/SettingsUtils.java
@@ -23,7 +23,7 @@ import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 /**
  * Utility class exposing connection settings to connect Redis instances during test execution. Settings can be adjusted
  * by overriding these in {@literal org/springframework/data/redis/test.properties}.
- * 
+ *
  * @author Costin Leau
  * @author Mark Paluch
  */
@@ -71,7 +71,7 @@ public abstract class SettingsUtils {
 
 	/**
 	 * Construct a new {@link RedisStandaloneConfiguration} initialized with test endpoint settings.
-	 * 
+	 *
 	 * @return a new {@link RedisStandaloneConfiguration} initialized with test endpoint settings.
 	 */
 	public static RedisStandaloneConfiguration standaloneConfiguration() {
@@ -80,7 +80,7 @@ public abstract class SettingsUtils {
 
 	/**
 	 * Construct a new {@link RedisSocketConfiguration} initialized with test endpoint settings.
-	 * 
+	 *
 	 * @return a new {@link RedisSocketConfiguration} initialized with test endpoint settings.
 	 */
 	public static RedisSocketConfiguration socketConfiguration() {