From 527024a0267e991eb7fab4801725951a514534d9 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Tue, 15 Nov 2016 19:51:05 +0200
Subject: [PATCH] Stop WorldPackets about invalid cells from causing
 framelistener errors

---
 apps/openmw/mwmp/WorldController.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmp/WorldController.cpp b/apps/openmw/mwmp/WorldController.cpp
index 77644e473..fa33eaf3f 100644
--- a/apps/openmw/mwmp/WorldController.cpp
+++ b/apps/openmw/mwmp/WorldController.cpp
@@ -25,7 +25,16 @@ MWWorld::CellStore *mwmp::WorldController::getCell(const ESM::Cell& cell)
     if (cell.isExterior())
         cellStore = MWBase::Environment::get().getWorld()->getExterior(cell.mData.mX, cell.mData.mY);
     else
-        cellStore = MWBase::Environment::get().getWorld()->getInterior(cell.mName);
+    {
+        try
+        {
+            cellStore = MWBase::Environment::get().getWorld()->getInterior(cell.mName);
+        }
+        catch (std::exception&)
+        {
+            cellStore = NULL;
+        }
+    }
 
     return cellStore;
 }