--- a/station_cmd.c	Sat Dec 18 12:40:34 2004 +0000
+++ b/station_cmd.c	Sat Dec 18 12:46:29 2004 +0000
@@ -1583,9 +1583,11 @@
 	cost += _price.build_airport * w * h;
 
 	if (flags & DC_EXEC) {
+		const AirportFTAClass *afc = GetAirport(p1);
+
 		st->owner = _current_player;
-		if (_current_player == _local_player && p1 <= AT_INTERNATIONAL) {
-      _last_built_aircraft_depot_tile = tile + GetAirport(p1)->airport_depots[0];
+		if (_current_player == _local_player && afc->nof_depots != 0) {
+      _last_built_aircraft_depot_tile = tile + afc->airport_depots[0];
     }
 
 		st->airport_tile = tile;