From 9339e4dcad8aa74ff1b2723ea63a2e31c23f5d44 Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Sun, 12 Apr 2020 00:03:49 +0200
Subject: [PATCH] Fix #8081: Check for waypoints when removing docking tiles

---
 src/station_cmd.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 060e5a0d53..b883838841 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2601,7 +2601,8 @@ void RemoveDockingTile(TileIndex t)
 		if (!IsValidTile(tile)) continue;
 
 		if (IsTileType(tile, MP_STATION)) {
-			UpdateStationDockingTiles(Station::GetByTile(tile));
+			Station *st = Station::GetByTile(tile);
+			if (st != nullptr) UpdateStationDockingTiles(st);
 		} else if (IsTileType(tile, MP_INDUSTRY)) {
 			Station *neutral = Industry::GetByTile(tile)->neutral_station;
 			if (neutral != nullptr) UpdateStationDockingTiles(neutral);