diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index b5d97e0f0..4ef245485 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -1343,8 +1343,11 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
             // npc up onto whatever it now touches. Only the horizontal push is wanted here.
             float prevStepHeight = this.stepHeight;
             this.stepHeight = 0.0F;
-            this.moveEntity(oldWidth - newWidth, 0.0D, oldWidth - newWidth);
-            this.stepHeight = prevStepHeight;
+            try {
+                this.moveEntity(oldWidth - newWidth, 0.0D, oldWidth - newWidth);
+            } finally {
+                this.stepHeight = prevStepHeight;
+            }
         }
     }