1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/newview/llpolymorph.cpp b/linden/indra/newview/llpolymorph.cpp
index 2d1375d..b36f0e2 100644
--- a/linden/indra/newview/llpolymorph.cpp
+++ b/linden/indra/newview/llpolymorph.cpp
@@ -214,6 +214,13 @@ BOOL LLPolyMorphTargetInfo::parseXml(LLXmlTreeNode* node)
 
         LLXmlTreeNode *paramNode = node->getChildByName("param_morph");
 
+        if (NULL == paramNode)
+        {
+                llwarns << "Failed to getChildByName(\"param_morph\")"
+                        << llendl;
+                return FALSE;
+        }
+
         for (LLXmlTreeNode* child_node = paramNode->getFirstChild();
                  child_node;
                  child_node = paramNode->getNextChild())
@@ -256,7 +263,10 @@ LLPolyMorphTarget::LLPolyMorphTarget(LLPolyMesh *poly_mesh)
 //-----------------------------------------------------------------------------
 LLPolyMorphTarget::~LLPolyMorphTarget()
 {
-        delete mVertMask;
+        if (mVertMask)
+        {
+                delete mVertMask;
+        }
 }
 
 //-----------------------------------------------------------------------------