diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 43fc7a67ec..c465c1f780 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1652,9 +1652,9 @@ void LLDAELoader::processChildJoints( domNode* pParentNode )
 //-----------------------------------------------------------------------------
 bool LLDAELoader::isNodeAJoint( domNode* pNode )
 {
-	if ( !pNode )
+    if ( !pNode || !pNode->getName() )
 	{
-		LL_INFOS()<<"Created node is NULL"<<LL_ENDL;
+		LL_INFOS()<<"Created node is NULL or invalid"<<LL_ENDL;
 		return false;
 	}
 	
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index b551958c5b..6894a91d7d 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -439,7 +439,7 @@ void LLConversationViewSession::setIconsVisible(bool visible)
 		
 	// Show/hide icons for the 1-n-1 chat.
 	LLConversationItem* vmi = dynamic_cast<LLConversationItem*>(getViewModelItem());
-	if (vmi)
+	if (vmi && mItemPanel)
 	{
 		switch (vmi->getType())
 		{