diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
index 92d42a2b6..432b64bfc 100644
--- a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
@@ -136,7 +136,7 @@ public abstract class AbstractChronicleMapBuilder<K, V,
     private MapEventListener<K, V, ChronicleMap<K, V>> eventListener =
             MapEventListeners.nop();
     private V defaultValue = null;
-    private DefaultValueProvider<K, V> defaultValueProvider = NullValueProvider.INSTANCE;
+    private DefaultValueProvider<K, V> defaultValueProvider = null;
     private PrepareValueBytes<K, V> prepareValueBytes = null;
 
     private SingleChronicleHashReplication singleHashReplication = null;
diff --git a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
index 886420120..c85c8f86f 100755
--- a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
@@ -17,7 +17,6 @@ public class DemoChronicleMapTest {
         File file = File.createTempFile("DummyOrders", ".test");
         file.deleteOnExit();
         int maxEntries = 1000;
-//        ChronicleMap<IntValue, DemoOrderVOInterface> map = ChronicleMapBuilder
         ChronicleMap<IntValue, DemoOrderVOInterface> map = OffHeapUpdatableChronicleMapBuilder
                 .of(IntValue.class, DemoOrderVOInterface.class)
                 .putReturnsNull(true)
@@ -37,7 +36,6 @@ public class DemoChronicleMapTest {
 
             map.acquireUsing(key, value);
 
-            // TODO Shouldn't throw an NPE, because acquire should set the value.
             value.setSymbol("IBM-" + i);
             value.addAtomicOrderQty(1000);
 
@@ -61,7 +59,6 @@ public class DemoChronicleMapTest {
         File file = File.createTempFile("DummyOrders", ".test");
         file.deleteOnExit();
         int maxEntries = 1000;
-//        ChronicleMap<IntValue, DemoOrderVOInterface> map = ChronicleMapBuilder
         ChronicleMap<IntValue, DemoOrderVOInterface> map = OffHeapUpdatableChronicleMapBuilder
                 .of(IntValue.class, DemoOrderVOInterface.class)
                 .putReturnsNull(true)
@@ -80,7 +77,6 @@ public class DemoChronicleMapTest {
             key.setValue(i);
 
             try (WriteContext wc = map.acquireUsingLocked(key, value)) {
-                // TODO Shouldn't throw an NPE, because acquire should set the value.
                 value.setSymbol("IBM-" + i);
                 value.addAtomicOrderQty(1000);
             }