diff --git a/doc/fixes37.0 b/doc/fixes37.0
index a92f238bc..570f79a17 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -158,6 +158,8 @@ monster or object detection found semi-dead vault guard at <0,0> while
 squadprob[] in mkroom.c was defined with 5 elements but initialized only 4
 	resulting in giant ants sometimes
 allow nurses heal attack when wielding a non-weapon/weaptool
+if riding or levitating, hero could apply bullwhip downward to pull up things
+	from underwater or lava; feedback implied the item was on the surface
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/apply.c b/src/apply.c
index 57671fa7b..45c2c7b54 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -2668,6 +2668,12 @@ struct obj *obj;
             kick_steed();
             return 1;
         }
+        if (is_pool_or_lava(u.ux, u.uy)) {
+            You("cause a small splash.");
+            if (is_lava(u.ux, u.uy))
+                (void) fire_damage(uwep, FALSE, u.ux, u.uy);
+            return 1;
+        }
         if (Levitation || u.usteed) {
             /* Have a shot at snaring something on the floor */
             otmp = g.level.objects[u.ux][u.uy];