diff --git a/src/game_defs.h b/src/game_defs.h
index 026d30db..63a81380 100644
--- a/src/game_defs.h
+++ b/src/game_defs.h
@@ -103,17 +103,20 @@ enum PlayerActionLog {
 	LOG_ACTION_JOIN			// has joined the game
 };
 
+#define LOG_UPLOAD_ERROR_PREFIX	"ERROR"
+#define LOG_UPLOAD_ID_SIZE		40
+
 enum LogUploadErrorCode {
-	ERROR_NO_FILE = 1,
-	ERROR_OPEN_DB = 2,
-	ERROR_MAX_NUM_TOTAL = 3,
-	ERROR_MAX_NUM_IP = 4,
-	ERROR_FILE_SIZE = 5,
-	ERROR_FILE_EXT = 6,
-	ERROR_FILE_HEAD = 7,
-	ERROR_ID = 8,
-	ERROR_FILE_MOVE = 9,
-	ERROR_INSERT_DB = 10
+	LOG_UPLOAD_ERROR_NO_FILE = 1,
+	LOG_UPLOAD_ERROR_OPEN_DB = 2,
+	LOG_UPLOAD_ERROR_MAX_NUM_TOTAL = 3,
+	LOG_UPLOAD_ERROR_MAX_NUM_IP = 4,
+	LOG_UPLOAD_ERROR_FILE_SIZE = 5,
+	LOG_UPLOAD_ERROR_FILE_EXT = 6,
+	LOG_UPLOAD_ERROR_FILE_HEAD = 7,
+	LOG_UPLOAD_ERROR_ID = 8,
+	LOG_UPLOAD_ERROR_FILE_MOVE = 9,
+	LOG_UPLOAD_ERROR_INSERT_DB = 10
 };
 
 enum DenyKickPlayerReason {
diff --git a/src/gui/qt/logfiledialog/logfiledialog.cpp b/src/gui/qt/logfiledialog/logfiledialog.cpp
index d1f8b101..2d7b1753 100644
--- a/src/gui/qt/logfiledialog/logfiledialog.cpp
+++ b/src/gui/qt/logfiledialog/logfiledialog.cpp
@@ -27,6 +27,7 @@
 #include "guilog.h"
 #include "configfile.h"
 #include "mymessagebox.h"
+#include <game_defs.h>
 #include <net/uploaderthread.h>
 
 LogFileDialog::LogFileDialog(QWidget *parent, ConfigFile *c) :
@@ -223,7 +224,7 @@ void LogFileDialog::uploadFile()
 
 		uploadInProgressAnimationStart();
 		uploader->QueueUpload(
-            "http://pokerth.net/log_file_analysis/upload.php",
+			"http://pokerth.net/log_file_analysis/upload.php",
 			"",
 			"",
 			file.fileName().toStdString(),
@@ -260,7 +261,7 @@ void LogFileDialog::showLogAnalysis(QString /*filename*/, QString returnMessage)
 
 	QString id = returnMessage.trimmed();
 
-	if(id.length() == 40 && !id.contains("ERROR")) {
+	if(id.length() == LOG_UPLOAD_ID_SIZE && !id.contains(LOG_UPLOAD_ERROR_PREFIX)) {
 
 		qDebug() << id << endl;
 		QDesktopServices::openUrl(QUrl("http://logfile-analysis.pokerth.net/?ID="+id));
@@ -268,8 +269,36 @@ void LogFileDialog::showLogAnalysis(QString /*filename*/, QString returnMessage)
 		qDebug() << returnMessage << endl;
 		QString serverMsg(tr("Processing of the log file on the web server failed.\nPlease verify that you are uploading a valid PokerTH log file."));
 		// if there is a readable message, display it.
-		if (!returnMessage.isEmpty() && returnMessage.size() < 128) {
-			serverMsg += "\n" + tr("Failure reason: ") + returnMessage;
+		if (returnMessage.startsWith(LOG_UPLOAD_ERROR_PREFIX)) {
+			serverMsg += "\n" + tr("Failure reason: ");
+			QString errorCodeStr = returnMessage.mid(sizeof(LOG_UPLOAD_ERROR_PREFIX)).trimmed();
+			int errorCode = errorCodeStr.toInt();
+			switch (errorCode)
+			{
+				case LOG_UPLOAD_ERROR_NO_FILE :
+					serverMsg += tr("No file received.");
+					break;
+				case LOG_UPLOAD_ERROR_MAX_NUM_TOTAL :
+					serverMsg += tr("File rejected because of too many uploads.");
+					break;
+				case LOG_UPLOAD_ERROR_MAX_NUM_IP :
+					serverMsg += tr("File rejected because of too many recent uploads. Please try again later.");
+					break;
+				case LOG_UPLOAD_ERROR_FILE_SIZE :
+					serverMsg += tr("The file is too large.");
+					break;
+				case LOG_UPLOAD_ERROR_FILE_EXT :
+				case LOG_UPLOAD_ERROR_FILE_HEAD :
+					serverMsg += tr("This file is not a valid and current PokerTH log file.");
+					break;
+				case LOG_UPLOAD_ERROR_OPEN_DB :
+				case LOG_UPLOAD_ERROR_ID :
+				case LOG_UPLOAD_ERROR_FILE_MOVE :
+				case LOG_UPLOAD_ERROR_INSERT_DB :
+				default :
+					serverMsg += tr("Internal error. Please try again later. ID: ") + errorCodeStr;
+					break;
+			}
 		}
 		MyMessageBox::warning(
 			this, tr("Uploading log file"), serverMsg, QMessageBox::Close );