diff --git a/src/Blockcore.Indexer.Core/Client/BitcoinClient.cs b/src/Blockcore.Indexer.Core/Client/BitcoinClient.cs
index 6cbd9c0e..60586322 100644
--- a/src/Blockcore.Indexer.Core/Client/BitcoinClient.cs
+++ b/src/Blockcore.Indexer.Core/Client/BitcoinClient.cs
@@ -581,6 +581,11 @@ private async Task<T> CheckResponseOkAsync<T>(HttpResponseMessage response)
 
                   JsonRpcResponse<T> ret = JsonConvert.DeserializeObject<JsonRpcResponse<T>>(jsonResult);
 
+                  if (ret?.Error != null)
+                  {
+                     HandleError(jsonResult, response);
+                  }
+
                   return ret == null ? default(T) : ret.Result;
                }
             }
@@ -628,29 +633,21 @@ private T CheckResponseOk<T>(HttpResponseMessage response)
             {
                using (var jsonStreamReader = new StreamReader(jsonStream))
                {
+                  string jsonResult = jsonStreamReader.ReadToEndAsync().Result;
+
                   if (response.StatusCode != HttpStatusCode.OK)
                   {
-                     JsonRpcResponse<T> errRet = null;
-                     string res = jsonStreamReader.ReadToEndAsync().Result;
-
-                     try
-                     {
-                        errRet = JsonConvert.DeserializeObject<JsonRpcResponse<T>>(res);
-                     }
-                     catch
-                     {
-                        throw CreateException(response, 0, res);
-                     }
-
-                     int code = errRet != null && errRet.Error != null ? errRet.Error.Code : 0;
-                     string msg = errRet != null && errRet.Error != null ? errRet.Error.Message : "Error";
-
-                     throw CreateException(response, code, msg);
+                     HandleError(jsonResult, response);
                   }
 
-                  JsonRpcResponse<T> ret = JsonConvert.DeserializeObject<JsonRpcResponse<T>>(jsonStreamReader.ReadToEndAsync().Result);
+                  JsonRpcResponse<T> ret = JsonConvert.DeserializeObject<JsonRpcResponse<T>>(jsonResult);
+
+                  if (ret?.Error != null)
+                  {
+                     HandleError(jsonResult, response);
+                  }
 
-                  return ret.Result;
+                  return ret == null ? default(T) : ret.Result;
                }
             }
          }