diff --git a/doc/contributions.txt b/doc/contributions.txt
index ef035c7035..25aebcef8e 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1092,6 +1092,7 @@ Nicky Dasmijn
 	SL-10293
 	SL-11061
     SL-11072
+	SL-13141
 Nicky Perian
 	OPEN-1
 	STORM-1087
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 49b1ee4e2e..7e31d585e5 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4953,7 +4953,7 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
 	}
 
 	LLVOAvatar* avatar = getAvatar();
-	if (avatar)
+	if (avatar && isRiggedMesh() && !isHUDAttachment())
 	{
 		LLAvatarAppearanceDefines::EBakedTextureIndex texIndex = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(id);
 		LLViewerTexture* bakedTexture = avatar->getBakedTexture(texIndex);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0cb5ca09ce..3b9d819be9 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -277,8 +277,10 @@ void LLVOVolume::markDead()
 {
 	if (!mDead)
 	{
-		if( getVolume() ) // <FS:ND/> Check for corrupted volume.
-		LLSculptIDSize::instance().rem(getVolume()->getParams().getSculptID());
+        if (getVolume())
+        {
+            LLSculptIDSize::instance().rem(getVolume()->getParams().getSculptID());
+        }
 
 		if(getMDCImplCount() > 0)
 		{