diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index e3774b2b7a..6cc7549c5f 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -370,9 +370,11 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
         std::string shortName = gDirUtilp->getBaseFileName(filename);
 
         // No extension
-        errorMessage = llformat(
-            "No file extension for the file: '%s'\nPlease make sure the file has a correct file extension",
-            shortName.c_str());
+        // <FS:Ansariel> Duplicate error message output
+        //errorMessage = llformat(
+        //    "No file extension for the file: '%s'\nPlease make sure the file has a correct file extension",
+        //    shortName.c_str());
+        // </FS:Ansariel>
         errorLabel = "NoFileExtension";
         error = true;
     }
@@ -382,8 +384,11 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
         assetType = LLAssetType::AT_TEXTURE;
         if (!LLViewerTextureList::createUploadFile(getFileName(), filename, codec))
         {
-            errorMessage = llformat("Problem with file %s:\n\n%s\n",
-                getFileName().c_str(), LLImage::getLastError().c_str());
+            // <FS:Ansariel> Duplicate error message output
+            //errorMessage = llformat("Problem with file %s:\n\n%s\n",
+            //    getFileName().c_str(), LLImage::getLastError().c_str());
+            errorMessage = LLImage::getLastError();
+            // </FS:Ansariel>
             errorLabel = "ProblemWithFile";
             error = true;
         }
@@ -405,12 +410,12 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
             switch (encodeResult)
             {
             case LLVORBISENC_DEST_OPEN_ERR:
-                errorMessage = llformat("Couldn't open temporary compressed sound file for writing: %s\n", filename.c_str());
+                //errorMessage = llformat("Couldn't open temporary compressed sound file for writing: %s\n", filename.c_str()); // <FS:Ansariel> Duplicate error message output
                 errorLabel = "CannotOpenTemporarySoundFile";
                 break;
 
             default:
-                errorMessage = llformat("Unknown vorbis encode failure on: %s\n", getFileName().c_str());
+                //errorMessage = llformat("Unknown vorbis encode failure on: %s\n", getFileName().c_str()); // <FS:Ansariel> Duplicate error message output
                 errorLabel = "UnknownVorbisEncodeFailure";
                 break;
             }
@@ -419,7 +424,7 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
     }
     else if (exten == "bvh")
     {
-        errorMessage = llformat("We do not currently support bulk upload of animation files\n");
+        //errorMessage = llformat("We do not currently support bulk upload of animation files\n"); // <FS:Ansariel> Duplicate error message output
         errorLabel = "DoNotSupportBulkAnimationUpload";
         error = true;
     }
@@ -451,6 +456,8 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
         LLSD errorResult(LLSD::emptyMap());
 
         errorResult["error"] = LLSD::Binary(true);
+        // <FS:Ansariel> Duplicate error message output
+        if (!errorMessage.empty())
         errorResult["message"] = errorMessage;
         errorResult["label"] = errorLabel;
         return errorResult;
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 9f533e8a68..0ff867f9ad 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -821,7 +821,7 @@ Erwartet wurde [VALIDS]
 	<notification name="ProblemWithFile">
 		Problem mit Datei [FILE]:
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		Temporäre komprimierte Sounddatei konnte nicht geöffnet werden: [FILE]
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2aa68c123d..69ea0476c0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2108,7 +2108,7 @@ Audio file is too long ([MAX_LENGTH] second maximum):
    type="alertmodal">
 Problem with file [FILE]:
 
-[ERROR]
+[REASON]
   <tag>fail</tag>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 2b2ba3a590..c866075f81 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -833,7 +833,7 @@ Se admiten [VALIDS]
 	<notification name="ProblemWithFile">
 		Problemas con el archivo [FILE]:
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		No se ha podido abrir para su escritura el archivo comprimido de sonido: [FILE]
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index c130de60c3..6b79193c31 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -811,7 +811,7 @@ Assurez-vous que le fichier a l&apos;extension correcte.
 	<notification name="ProblemWithFile">
 		Problème avec le fichier [FILE] :
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		Impossible d&apos;ouvrir le fichier son compressé temporaire : [FILE]
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index fa3bd26bc0..1d4545d6b7 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -794,7 +794,7 @@ Attese [VALIDS]
 	<notification name="ProblemWithFile">
 		Problemi con il file [FILE]:
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		Impossibile aprire in scrittura il file temporaneamente compresso: [FILE]
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 7767fe28a8..08f602b430 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -845,7 +845,7 @@ L$ が不足しているのでこのグループに参加することができ
 	<notification name="ProblemWithFile">
 		「 [FILE] 」に問題があります。
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		書き込み用の一時圧縮サウンドファイルを開くことができません：[FILE]
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index cec668f8a9..b6d5b43c4a 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -750,7 +750,7 @@ Oczekiwane: [VALIDS]
 	<notification name="ProblemWithFile">
 		Problem z plikiem [FILE]:
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		Nie można otworzyć tymczasowego skompresowanego pliku dźwiękowego w celu zapisu: [FILE]
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 84b20860c8..a8cf02c496 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -790,7 +790,7 @@ Esperada [VALIDS]
 	<notification name="ProblemWithFile">
 		Problemas com o arquivo [FILE]:
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		Não pode abrir o arquivo temporário de som comprimido, para leitura: [FILE]
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 40a56f2d3b..4f56045763 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -834,7 +834,7 @@
 	<notification name="ProblemWithFile">
 		Проблема с файлом [FILE]:
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		Не удалось открыть для записи временно сжатый звуковой файл: [FILE]
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 266f9e7063..d8e3dcb469 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -812,7 +812,7 @@ Beklenen [VALIDS]
 	<notification name="ProblemWithFile">
 		[FILE] dosyasında sorun oluştu:
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		Geçici sıkıştırılmış ses dosyası yazma için açılamadı: [FILE]
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index d136df759c..64daeedea4 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -796,7 +796,7 @@
 	<notification name="ProblemWithFile">
 		檔案 [FILE] 有問題：
 
-[ERROR]
+[REASON]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
 		無法開啟並寫入暫時壓縮音頻檔：[FILE]