--- a/jdk/src/share/classes/java/util/HashMap.java	Fri Sep 20 11:07:06 2013 -0700
+++ b/jdk/src/share/classes/java/util/HashMap.java	Fri Sep 20 15:12:05 2013 -0700
@@ -1132,6 +1132,8 @@
 
     public V computeIfPresent(K key,
                               BiFunction<? super K, ? super V, ? extends V> remappingFunction) {
+        if (remappingFunction == null)
+            throw new NullPointerException();
         Node<K,V> e; V oldValue;
         int hash = hash(key);
         if ((e = getNode(hash, key)) != null &&