From d96f6116e6e5637b4a7e1002e5f3dff486e277c7 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 14 Feb 2025 10:45:09 +0300
Subject: [PATCH] Don't add non-existent cell travel destinations (#8349)

---
 apps/openmw/mwgui/travelwindow.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 6ba3a55286..e364d19770 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -4,6 +4,7 @@
 #include <MyGUI_Gui.h>
 #include <MyGUI_ScrollView.h>
 
+#include <components/debug/debuglog.hpp>
 #include <components/esm3/loadcrea.hpp>
 #include <components/esm3/loadgmst.hpp>
 #include <components/misc/strings/conversion.hpp>
@@ -131,12 +132,18 @@ namespace MWGui
             bool interior = true;
             const ESM::ExteriorCellLocation cellIndex
                 = ESM::positionToExteriorCellLocation(dest.mPos.pos[0], dest.mPos.pos[1]);
+            const MWWorld::WorldModel& worldModel = *MWBase::Environment::get().getWorldModel();
             if (cellname.empty())
             {
-                MWWorld::CellStore& cell = MWBase::Environment::get().getWorldModel()->getExterior(cellIndex);
+                MWWorld::CellStore& cell = worldModel.getExterior(cellIndex);
                 cellname = MWBase::Environment::get().getWorld()->getCellName(&cell);
                 interior = false;
             }
+            else if (worldModel.findCell(cellname, false) == nullptr)
+            {
+                Log(Debug::Error) << "Failed to add travel destination: unknown cell (" << cellname << ")";
+                continue;
+            }
             addDestination(ESM::RefId::stringRefId(cellname), dest.mPos, interior);
         }