1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 9c895cb..55210ad 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -240,8 +240,11 @@ LLViewerObject::~LLViewerObject()
         std::map<U16, ExtraParameter*>::iterator iter;
         for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
         {
-                delete iter->second->data;
-                delete iter->second;
+                if(iter->second != NULL)
+                {
+                        delete iter->second->data;
+                        delete iter->second;
+                }
         }
         mExtraParameterList.clear();