diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java
index b63d81a33..a6fd769d0 100644
--- a/src/main/java/baritone/behavior/ElytraBehavior.java
+++ b/src/main/java/baritone/behavior/ElytraBehavior.java
@@ -177,10 +177,12 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
                     })
                     .whenComplete((result, ex) -> {
                         this.recalculating = false;
-                        if (ex instanceof PathCalculationException) {
-                            logDirect("Failed to compute next segment");
-                        } else {
-                            logUnhandledException(ex);
+                        if (ex != null) {
+                            if (ex instanceof PathCalculationException) {
+                                logDirect("Failed to compute next segment");
+                            } else {
+                                logUnhandledException(ex);
+                            }
                         }
                     });
         }