diff --git a/core/src/com/unciv/logic/map/MapPathing.kt b/core/src/com/unciv/logic/map/MapPathing.kt
index 5903f388f7..1e99f465ed 100644
--- a/core/src/com/unciv/logic/map/MapPathing.kt
+++ b/core/src/com/unciv/logic/map/MapPathing.kt
@@ -24,8 +24,8 @@ object MapPathing {
     }
 
     fun isValidRoadPathTile(unit: MapUnit, tile: Tile): Boolean {
-        val roadImprovement = tile.ruleset.roadImprovement ?: return false
-        val railRoadImprovement = tile.ruleset.railroadImprovement ?: return false
+        val roadImprovement = tile.ruleset.roadImprovement
+        val railRoadImprovement = tile.ruleset.railroadImprovement
         
         if (tile.isWater) return false
         if (tile.isImpassible()) return false
@@ -34,8 +34,8 @@ object MapPathing {
         
         return tile.hasRoadConnection(unit.civ, false)
                 || tile.hasRailroadConnection(false)
-                || tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ)
-                || tile.improvementFunctions.canBuildImprovement(railRoadImprovement, unit.civ)
+                || roadImprovement != null && tile.improvementFunctions.canBuildImprovement(roadImprovement, unit.civ)
+                || railRoadImprovement != null && tile.improvementFunctions.canBuildImprovement(railRoadImprovement, unit.civ)
     }
 
     /**
diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index d491ee8cd2..e752b0767e 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -141,8 +141,8 @@ class Ruleset {
         }.toSet()
     }
 
-    val roadImprovement by lazy { RoadStatus.Road.improvement(this) }
-    val railroadImprovement by lazy { RoadStatus.Railroad.improvement(this) }
+    val roadImprovement: TileImprovement? by lazy { RoadStatus.Road.improvement(this) }
+    val railroadImprovement: TileImprovement? by lazy { RoadStatus.Railroad.improvement(this) }
     //endregion
 
     fun clone(): Ruleset {