diff --git a/src/cc/co/evenprime/bukkit/nocheat/checks/blockplace/OnLiquidCheck.java b/src/cc/co/evenprime/bukkit/nocheat/checks/blockplace/OnLiquidCheck.java
index e719fbda..4bb1d6ae 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/checks/blockplace/OnLiquidCheck.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/checks/blockplace/OnLiquidCheck.java
@@ -32,7 +32,7 @@ public class OnLiquidCheck {
 
         boolean cancel = false;
 
-        if(blockPlaced == null) {
+        if(blockPlaced == null || blockPlaced.isEmpty()) {
             // all ok
         } else if(blockPlacedAgainst != null && isSolid(blockPlacedAgainst)) {
             // all ok
diff --git a/src/cc/co/evenprime/bukkit/nocheat/events/PlayerMoveEventManager.java b/src/cc/co/evenprime/bukkit/nocheat/events/PlayerMoveEventManager.java
index ec296c2b..0ac32892 100644
--- a/src/cc/co/evenprime/bukkit/nocheat/events/PlayerMoveEventManager.java
+++ b/src/cc/co/evenprime/bukkit/nocheat/events/PlayerMoveEventManager.java
@@ -109,9 +109,12 @@ public class PlayerMoveEventManager extends PlayerListener implements EventManag
             if(newVal >= 0.0D) {
                 mdata.vertVelocity += newVal;
                 mdata.vertFreedom += mdata.vertVelocity;
-                mdata.vertVelocityCounter = 50;
             }
 
+            mdata.vertVelocityCounter = 50;
+            
+            mdata.fallDistance = 0.0f; // Don't be too unforgiving with fall damage
+
             newVal = Math.sqrt(Math.pow(v.getX(), 2) + Math.pow(v.getZ(), 2));
             if(newVal > 0.0D) {
                 mdata.horizFreedom += newVal;