diff --git a/app/src/main/java/com/tangem/data/network/ServerApiStellar.java b/app/src/main/java/com/tangem/data/network/ServerApiStellar.java
index 9882a26902..f364820eb1 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiStellar.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiStellar.java
@@ -136,7 +136,7 @@ public class ServerApiStellar {
                 LOG.e(TAG, "requestData " + stellarRequest.getClass().getSimpleName() + " onError " + e.getMessage());
                 LOG.e(TAG, String.format("%d requests left in processing", requestsCount));
 
-                if (isRetry || stellarRequest.errorResponse.getCode() == 404) {
+                if (isRetry || (stellarRequest.errorResponse != null && stellarRequest.errorResponse.getCode() == 404)) {
                     stellarRequest.setError(e.getMessage());
                     //setErrorOccurred(e.getMessage());//;
                     listener.onFail(stellarRequest);
@@ -155,7 +155,7 @@ public class ServerApiStellar {
                 if (stellarRequest.getError() != null) {
                     LOG.i(TAG, "requestData " + stellarRequest.getClass().getSimpleName() + " onComplete, error!=null");
 
-                    if (isRetry || stellarRequest.errorResponse.getCode() == 404) {
+                    if (isRetry || (stellarRequest.errorResponse != null && stellarRequest.errorResponse.getCode() == 404)) {
                         listener.onFail(stellarRequest);
                     } else {
                         retryRequest(ctx, stellarRequest);
diff --git a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
index df1a0088f1..aebf1d808d 100644
--- a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
+++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
@@ -182,7 +182,8 @@ public class TokenEngine extends CoinEngine {
         if (coinData == null) return false;
         if (coinData.getBalanceInInternalUnits() == null && coinData.getBalanceAlterInInternalUnits() == null)
             return false;
-        return coinData.getBalanceInInternalUnits().notZero() || coinData.getBalanceAlterInInternalUnits().notZero();
+        return (coinData.getBalanceInInternalUnits() != null && coinData.getBalanceInInternalUnits().notZero() ) ||
+                (coinData.getBalanceAlterInInternalUnits() != null && coinData.getBalanceAlterInInternalUnits().notZero());
     }
 
 
diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java
index b3c2b98d83..b25bdc163d 100644
--- a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java
+++ b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java
@@ -163,7 +163,7 @@ public class XlmAssetEngine extends CoinEngine {
 
     @Override
     public Uri getWalletExplorerUri() {
-        return Uri.parse("http://stellarchain.io/address/" + ctx.getCoinData().getWallet());
+        return Uri.parse("https://stellar.expert/explorer/public/account/" + ctx.getCoinData().getWallet());
     }
 
     @Override
diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
index 717d3d85bf..11497062f0 100644
--- a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
+++ b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
@@ -143,7 +143,7 @@ public class XlmEngine extends CoinEngine {
 
     @Override
     public Uri getWalletExplorerUri() {
-        return Uri.parse((ctx.getBlockchain() == Blockchain.Stellar ? "http://stellarchain.io/address/" : "http://testnet.stellarchain.io/address/") + ctx.getCoinData().getWallet());
+        return Uri.parse((ctx.getBlockchain() == Blockchain.Stellar ? "https://stellar.expert/explorer/public/account/" : "https://stellar.expert/explorer/testnet/account/") + ctx.getCoinData().getWallet());
     }
 
     @Override
@@ -429,7 +429,7 @@ public class XlmEngine extends CoinEngine {
             public void onFail(StellarRequest.Base request) {
                 Log.i(TAG, "onFail: " + request.getClass().getSimpleName() + " " + request.getError());
 
-                if (request.errorResponse.getCode() == 404) {
+                if (request.errorResponse != null && request.errorResponse.getCode() == 404) {
                     coinData.setTargetAccountCreated(false);
 
                     if (amount.compareTo(coinData.getReserve()) >= 0) { //TODO: take fee inclusion in account, now 1 XLM with fee included will fail after transaction is sent
@@ -492,7 +492,7 @@ public class XlmEngine extends CoinEngine {
             public void onFail(StellarRequest.Base request) {
                 Log.i(TAG, "onFail: " + request.getClass().getSimpleName() + " " + request.getError());
 
-                if (request.errorResponse.getCode() == 404) {
+                if (request.errorResponse != null && request.errorResponse.getCode() == 404) {
                     coinData.setError404(true);
                 } else {
                     ctx.setError(request.getError());
diff --git a/build.gradle b/build.gradle
index dca2b516ad..132bfece5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'io.fabric.tools:gradle:1.31.0'