diff --git a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java
index 5f6ee25..234e7f0 100644
--- a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java
+++ b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java
@@ -24,7 +24,7 @@ public class GlobalExceptionHandler {
         headers.setContentType(new MediaType("application", "xml", Charset.forName("windows-1251")));
         CommonError commonError = getCommonError(ex);
         commonError.setStatus("error");
-        commonError.setErrorCode(ex.getErrorMessage().getSubject().getErrorCode());
+        commonError.setErrorCode(ex.getErrorMessage().getSubject().getCode());
         commonError.setErrorText(messageResolver.resolve(ex.getErrorMessage()));
 
         if (ex instanceof SignalClientException) {
diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java b/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java
index fff91e7..13e1131 100644
--- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java
+++ b/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java
@@ -17,9 +17,9 @@ public class MonitoringDownloadError implements CommonError {
 
     @XmlElement(name = "Status", required = true)
     protected String status;
-    @XmlElement(name = "ErrorCode",required = true)
+    @XmlElement(name = "Code",required = true)
     protected String errorCode;
-    @XmlElement(name = "ErrorText",required = true)
+    @XmlElement(name = "Message",required = true)
     protected String errorText;
 
 }
diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java b/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java
index 07525d2..8250222 100644
--- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java
+++ b/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java
@@ -17,9 +17,9 @@ public class MonitoringReportListError implements CommonError {
 
     @XmlElement(name = "Status", required = true)
     protected String status;
-    @XmlElement(name = "ErrorCode",required = true)
+    @XmlElement(name = "Code",required = true)
     protected String errorCode;
-    @XmlElement(name = "ErrorText",required = true)
+    @XmlElement(name = "Message",required = true)
     protected String errorText;
 
 }
diff --git a/src/main/java/ru/nbch/credit_tracker/utils/error/SimpleMessageResolver.java b/src/main/java/ru/nbch/credit_tracker/utils/error/SimpleMessageResolver.java
index d856415..6384b58 100644
--- a/src/main/java/ru/nbch/credit_tracker/utils/error/SimpleMessageResolver.java
+++ b/src/main/java/ru/nbch/credit_tracker/utils/error/SimpleMessageResolver.java
@@ -8,6 +8,10 @@ import java.util.Arrays;
 public class SimpleMessageResolver {
     public String resolve(EnumKeyMessage errorMessage) {
         if (errorMessage == null) return "null";
-        return String.format("%s %s", errorMessage.getSubject().getKey(), Arrays.toString(errorMessage.getArgs()));
+        if(errorMessage.getArgs().length == 0)  {
+            return errorMessage.getSubject().getKey();
+        } else {
+            return String.format("%s %s", errorMessage.getSubject().getKey(), Arrays.toString(errorMessage.getArgs()));
+        }
     }
 }