--- old/src/share/classes/java/util/HashMap.java	2013-10-03 20:30:26.115126304 -0700
+++ new/src/share/classes/java/util/HashMap.java	2013-10-03 20:30:25.963126297 -0700
@@ -1230,7 +1230,11 @@
             }
         }
         if (old != null) {
-            V v = remappingFunction.apply(old.value, value);
+            V v;
+            if(old.value != null)
+                v = remappingFunction.apply(old.value, value);
+            else
+                v = value;
             if (v != null) {
                 old.value = v;
                 afterNodeAccess(old);