1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 5f73d8e901..13477f0e16 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1891,8 +1891,17 @@ LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
     }
     else
     {
-        LLViewerRegion* old_regionp = ((LLDrawable*)entry->getEntry()->getDrawable())->getRegion();
-        if(old_regionp != this)
+        LLDrawable* drawablep = (LLDrawable*)entry->getEntry()->getDrawable();
+        if (!drawablep || drawablep->isDead() || drawablep->getVObj().isNull())
+        {
+            LL_WARNS() << "Entry: " << entry->getLocalID() << " has a dead or invalid drawable; resetting to inactive." << LL_ENDL;
+            mImpl->mVisibleEntries.erase(entry);
+            entry->setState(LLVOCacheEntry::INACTIVE);
+            return NULL;
+        }
+
+        LLViewerRegion* old_regionp = drawablep->getRegion();
+        if (old_regionp != this)
         {
             //this object exists in two regions at the same time;
             //this case can be safely ignored here because