diff --git a/src/Block/Adminhtml/System/Config/Form/Fieldset/Payment.php b/src/Block/Adminhtml/System/Config/Form/Fieldset/Payment.php
index 25435a7..da3fa18 100644
--- a/src/Block/Adminhtml/System/Config/Form/Fieldset/Payment.php
+++ b/src/Block/Adminhtml/System/Config/Form/Fieldset/Payment.php
@@ -116,7 +116,7 @@ class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
             return $defaultValues;
         }
 
-        if ($response->isSuccessful()) {
+        if (isset($response['paymentTypes']) && $response->isSuccessful()) {
             $paymentsTypes = $response['paymentTypes'];
         } else {
             return $defaultValues;
diff --git a/src/Block/Adminhtml/System/Config/Form/Fieldset/Shipping.php b/src/Block/Adminhtml/System/Config/Form/Fieldset/Shipping.php
index 8ba7999..5ee32d9 100644
--- a/src/Block/Adminhtml/System/Config/Form/Fieldset/Shipping.php
+++ b/src/Block/Adminhtml/System/Config/Form/Fieldset/Shipping.php
@@ -117,13 +117,17 @@ class Shipping extends \Magento\Config\Block\System\Config\Form\Fieldset
 
         $values = [];
 
-        $response = $this->client->deliveryTypesList();
+        try {
+            $response = $this->client->deliveryTypesList();
+        } catch (\Exception $exception) {
+            return $defaultValues;
+        }
 
         if ($response === false) {
             return $defaultValues;
         }
 
-        if ($response->isSuccessful()) {
+        if (isset($response['deliveryTypes']) && $response->isSuccessful()) {
             $deliveryTypes = $response['deliveryTypes'];
         } else {
             return $defaultValues;
diff --git a/src/Block/Adminhtml/System/Config/Form/Fieldset/Site.php b/src/Block/Adminhtml/System/Config/Form/Fieldset/Site.php
index 10e9872..a6c50ea 100644
--- a/src/Block/Adminhtml/System/Config/Form/Fieldset/Site.php
+++ b/src/Block/Adminhtml/System/Config/Form/Fieldset/Site.php
@@ -109,13 +109,17 @@ class Site extends \Magento\Config\Block\System\Config\Form\Fieldset
 
         $values = [];
 
-        $response = $this->client->sitesList();
+        try {
+            $response = $this->client->sitesList();
+        } catch (\Exception $exception) {
+            return $defaultValues;
+        }
 
         if ($response === false) {
             return $defaultValues;
         }
 
-        if ($response->isSuccessful()) {
+        if (isset($response['sites']) && $response->isSuccessful()) {
             $sites = $response['sites'];
         } else {
             return $defaultValues;
diff --git a/src/Block/Adminhtml/System/Config/Form/Fieldset/Sites.php b/src/Block/Adminhtml/System/Config/Form/Fieldset/Sites.php
index dfefd48..cd0a128 100644
--- a/src/Block/Adminhtml/System/Config/Form/Fieldset/Sites.php
+++ b/src/Block/Adminhtml/System/Config/Form/Fieldset/Sites.php
@@ -115,13 +115,17 @@ class Sites extends \Magento\Config\Block\System\Config\Form\Fieldset
 
         $values = [];
 
-        $response = $this->client->sitesList();
+        try {
+            $response = $this->client->sitesList();
+        } catch (\Exception $exception) {
+            return $defaultValues;
+        }
 
         if ($response === false) {
             return $defaultValues;
         }
 
-        if ($response->isSuccessful()) {
+        if (isset($response['sites']) && $response->isSuccessful()) {
             $sites = $response['sites'];
         } else {
             return $defaultValues;
diff --git a/src/Block/Adminhtml/System/Config/Form/Fieldset/Status.php b/src/Block/Adminhtml/System/Config/Form/Fieldset/Status.php
index f141ee2..c87213a 100644
--- a/src/Block/Adminhtml/System/Config/Form/Fieldset/Status.php
+++ b/src/Block/Adminhtml/System/Config/Form/Fieldset/Status.php
@@ -111,13 +111,17 @@ class Status extends \Magento\Config\Block\System\Config\Form\Fieldset
 
         $values = [];
 
-        $response = $this->client->statusesList();
+        try {
+            $response = $this->client->statusesList();
+        } catch (\Exception $exception) {
+            return $defaultValues;
+        }
 
         if ($response === false) {
             return $defaultValues;
         }
 
-        if ($response->isSuccessful()) {
+        if (isset($response['statuses']) && $response->isSuccessful()) {
             $statuses = $response['statuses'];
         } else {
             return $defaultValues;
diff --git a/src/Test/Helpers/FieldsetTest.php b/src/Test/Helpers/FieldsetTest.php
index 77797ab..3e32f75 100644
--- a/src/Test/Helpers/FieldsetTest.php
+++ b/src/Test/Helpers/FieldsetTest.php
@@ -102,7 +102,7 @@ class FieldsetTest extends TestCase
             \Magento\Config\Block\System\Config\Form::class,
             ['getElements', 'getRequest']
         );
-        $this->form->expects($this->any())->method('getElements')->willReturn($elementCollection);
+        //$this->form->expects($this->any())->method('getElements')->willReturn($elementCollection);
         $this->form->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
     }
 }
diff --git a/src/Test/Unit/Model/Service/InventoriesUploadTest.php b/src/Test/Unit/Model/Service/InventoriesUploadTest.php
index e82c9fd..9dfac27 100644
--- a/src/Test/Unit/Model/Service/InventoriesUploadTest.php
+++ b/src/Test/Unit/Model/Service/InventoriesUploadTest.php
@@ -49,6 +49,7 @@ class InventoriesUploadTest extends TestCase
     {
         if ($response != false) {
             $responseInventories = new \RetailCrm\Response\ApiResponse(200, json_encode($response));
+            $responseInventories->asJsonResponse($response);
 
             $this->mockResponse->expects($this->any())
                 ->method('isSuccessful')