From f6d36d5d80a89b8794a7a60d1b05b30e2df94d24 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Thu, 31 Aug 2017 03:40:36 +0300
Subject: [PATCH] [Client] Ensure that objects searched for have a valid
 reference number

---
 apps/openmw/mwworld/cellstore.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index f947d7134..fa221154a 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -526,6 +526,10 @@ namespace MWWorld
     */
     Ptr CellStore::searchExact (unsigned int refNumIndex, unsigned int mpNum)
     {
+        // Ensure that all objects searched for have a valid reference number
+        if (refNumIndex == 0 && mpNum == 0)
+            return 0;
+
         SearchExactVisitor<MWWorld::Ptr> searchVisitor;
         searchVisitor.mRefNumIndexToFind = refNumIndex;
         searchVisitor.mMpNumToFind = mpNum;