diff --git a/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java b/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java
index bcb77aca2..8542dbb2c 100644
--- a/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java
+++ b/src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java
@@ -23,9 +23,9 @@ import java.util.Date;
 import java.util.Enumeration;
 import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
+import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.data.redis.connection.DataType;
@@ -104,11 +104,13 @@ public class RedisProperties extends Properties implements RedisMap<Object, Obje
 	public synchronized void putAll(Map<? extends Object, ? extends Object> t) {
 		delegate.putAll((Map<? extends String, ? extends String>) t);
 	}
-	
+
 	@Override
 	public Enumeration<?> propertyNames() {
 		Set<String> keys = new LinkedHashSet<String>(delegate.keySet());
-		keys.addAll(defaults.stringPropertyNames());
+		if (defaults != null) {
+			keys.addAll(defaults.stringPropertyNames());
+		}
 		return Collections.enumeration(keys);
 	}
 
diff --git a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java
index ef93f5308..b1bc7af56 100644
--- a/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java
+++ b/src/test/java/org/springframework/data/redis/support/collections/RedisPropertiesTests.java
@@ -176,11 +176,11 @@ public class RedisPropertiesTests extends RedisMapTests {
 
 	@Test
 	public void testPropertyNames() throws Exception {
-		String key1="foo";
-		String key2="x";
+		String key1 = "foo";
+		String key2 = "x";
 		String key3 = "d";
 
-		String val ="o";
+		String val = "o";
 
 		defaults.setProperty(key3, val);
 		props.setProperty(key1, val);
@@ -195,6 +195,12 @@ public class RedisPropertiesTests extends RedisMapTests {
 		assertFalse(names.hasMoreElements());
 	}
 
+	@Test
+	public void testDefaultInit() throws Exception {
+		RedisProperties redisProperties = new RedisProperties("foo", template);
+		redisProperties.propertyNames();
+	}
+
 	@Test
 	public void testStringPropertyNames() throws Exception {
 		String key1 = "foo";