diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 78b857c354..4ba949f39b 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2554,6 +2554,7 @@ bool CanBuildVehicleInfrastructure(VehicleType type)
 {
 	assert(IsPlayerBuildableVehicleType(type));
 
+	if (!IsValidPlayer(_current_player)) return false;
 	if (_patches.always_build_infrastructure) return true;
 
 	UnitID max;