diff --git a/src/main/java/baritone/behavior/PathingBehavior.java b/src/main/java/baritone/behavior/PathingBehavior.java
index 9582f3c5..d2a55127 100644
--- a/src/main/java/baritone/behavior/PathingBehavior.java
+++ b/src/main/java/baritone/behavior/PathingBehavior.java
@@ -87,6 +87,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         dispatchEvents();
         if (event.getType() == TickEvent.Type.OUT) {
             secretInternalSegmentCancel();
+            baritone.getPathingControlManager().cancelEverything();
             return;
         }
         tickPath();
diff --git a/src/main/java/baritone/process/CustomGoalProcess.java b/src/main/java/baritone/process/CustomGoalProcess.java
index 52769f25..1e1b7473 100644
--- a/src/main/java/baritone/process/CustomGoalProcess.java
+++ b/src/main/java/baritone/process/CustomGoalProcess.java
@@ -82,7 +82,7 @@ public class CustomGoalProcess extends BaritoneProcessHelper implements ICustomG
                 if (calcFailed) {
                     onLostControl();
                 }
-                if (goal.isInGoal(playerFeet())) {
+                if (goal == null || goal.isInGoal(playerFeet())) {
                     onLostControl(); // we're there xd
                 }
                 return new PathingCommand(goal, PathingCommandType.SET_GOAL_AND_PATH);