From 65500461e1ebfc29dcaa710dc034b674735e792d Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Sat, 1 Jan 2022 19:56:12 +0100
Subject: [PATCH] Fix #16073: Crash in Sub6E1F34SmallScenery()

---
 src/openrct2-ui/windows/TopToolbar.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index 962aa4125a..68b4e44a39 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -1267,7 +1267,13 @@ static void Sub6E1F34SmallScenery(
     uint16_t maxPossibleHeight = (std::numeric_limits<decltype(TileElement::base_height)>::max() - 32) * ZoomLevel::max();
     bool can_raise_item = false;
 
-    auto* sceneryEntry = get_small_scenery_entry(sceneryIndex);
+    const auto* sceneryEntry = get_small_scenery_entry(sceneryIndex);
+    if (sceneryEntry == nullptr)
+    {
+        gridPos.SetNull();
+        return;
+    }
+
     maxPossibleHeight -= sceneryEntry->height;
     if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_STACKABLE))
     {