diff --git a/TemplePlus/pathfinding.cpp b/TemplePlus/pathfinding.cpp
index 8d3f12b61..b3ed8e6d5 100644
--- a/TemplePlus/pathfinding.cpp
+++ b/TemplePlus/pathfinding.cpp
@@ -2117,7 +2117,9 @@ int Pathfinding::FindPathShortDistanceSansTarget(PathQuery* pq, Path* pqr)
 
 	int shiftedXidx, shiftedYidx, newIdx;
 
-	float requisiteClearance = objects.GetRadius(pq->critter);
+	float requisiteClearance = 0.0;
+	if (pq->critter)
+		requisiteClearance = objects.GetRadius(pq->critter);
 	float diagonalClearance = requisiteClearance * 0.7f;
 	float requisiteClearanceCritters = requisiteClearance * 0.7f;
 	if (requisiteClearance > 12)
diff --git a/tpdata/clearances.dat b/tpdata/clearances.dat
index a61839e5d..8a84989e3 100644
Binary files a/tpdata/clearances.dat and b/tpdata/clearances.dat differ
diff --git a/tpdata/kotbfixes.dat b/tpdata/kotbfixes.dat
index f2ec07735..50d4a7ac8 100644
Binary files a/tpdata/kotbfixes.dat and b/tpdata/kotbfixes.dat differ