diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index a320f07a9fc9624a6ef4862de51dbf58a768829f..7c6721cad93f6df84ea82b09b6b466c777042d66 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -488,6 +488,14 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
 						errorLabel = "";
 						error = false;
 					}
+					else
+					{
+						errorMessage = "Failed saving temporary animation file";
+					}
+				}
+				else
+				{
+					errorMessage = "Failed reading animation file";
 				}
 			}
 		}
@@ -908,6 +916,7 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res
     {
         args["FILE"] = uploadInfo->getDisplayName();
         args["REASON"] = reason;
+        args["ERROR"] = reason;
     }
 
     LLNotificationsUtil::add(label, args);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 487730e209deb0e6cba85c53b8d32237ff382157..b1f04601fdca66d98f2c5be746e7f980f84d619b 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6145,6 +6145,7 @@ LLJoint *LLVOAvatar::getJoint( const std::string &name )
 	LLJoint* jointp = NULL;
 
 	if (iter == mJointMap.end() || iter->second == NULL)
+	{
 		joint_alias_map_t::const_iterator alias_iter = mJointAliasMap.find(name);
 		std::string canonical_name;
 		if (alias_iter != mJointAliasMap.end())