diff --git a/saga/actor.cpp b/saga/actor.cpp
index d3607aad1aa..73bc427f210 100644
--- a/saga/actor.cpp
+++ b/saga/actor.cpp
@@ -2543,6 +2543,7 @@ int Actor::fillPathArray(const Point &fromPoint, const Point &toPoint, Point &be
 				bestRating = currentRating;
 				bestPath = nextPoint;
 			}
+			pathDirection = &_pathDirectionList[i];
 		}
 		++i;
 	} while (i < _pathDirectionListCount);
diff --git a/saga/font.cpp b/saga/font.cpp
index d5400b43c04..649feb6e004 100644
--- a/saga/font.cpp
+++ b/saga/font.cpp
@@ -504,6 +504,10 @@ int Font::getHeight(FontId fontId, const char *text, int width, FontEffectFlags
 			}
 			// Wrap what we've got and restart
 			textPoint.y += h + TEXT_LINESPACING;
+			if (foundPointer == NULL) {
+				// Since word hit NULL but fit, we are done
+				return textPoint.y + h;
+			}
 			w_total = 0;
 			len_total = 0;
 			wc = 0;