diff --git a/client/tool/ArcGisPro.cs b/client/tool/ArcGisPro.cs
index 52994b0..dbc5ac1 100644
--- a/client/tool/ArcGisPro.cs
+++ b/client/tool/ArcGisPro.cs
@@ -33,8 +33,8 @@ public class ArcGisPro
             {
                 Error = new Error()
                 {
-                    Code = results.ErrorCode,
-                    Message = GetMessagesString(results.ErrorMessages)
+                    Code = results.ErrorCode.ToString(),
+                    Message = GetMessagesString(results.ErrorMessages)+"\n"+GetMessagesString(results.Messages)
                 }
             };
         }else if(results.HasWarnings)
diff --git a/server/CallArcGISPro.cs b/server/CallArcGISPro.cs
index 4d5c611..016b399 100644
--- a/server/CallArcGISPro.cs
+++ b/server/CallArcGISPro.cs
@@ -22,7 +22,7 @@ public class CallArcGISPro
             {
                 Error = new Error()
                 {
-                    Code = results.ErrorCode,
+                    Code = results.ErrorCode.ToString(),
                     Message = JsonConvert.SerializeObject(results.ErrorMessages)
                 }
             };
diff --git a/server/JsonRpcErrorEntity.cs b/server/JsonRpcErrorEntity.cs
index ad0d795..ca57640 100644
--- a/server/JsonRpcErrorEntity.cs
+++ b/server/JsonRpcErrorEntity.cs
@@ -17,7 +17,7 @@ namespace LinkToolAddin.server
     public partial class Error
     {
         [JsonProperty("code")]
-        public long Code { get; set; }
+        public string Code { get; set; }
 
         [JsonProperty("message")]
         public string Message { get; set; }