diff --git a/configure_cake_wallet_android.sh b/configure_cake_wallet_android.sh
index b8aa433de..6998555d5 100755
--- a/configure_cake_wallet_android.sh
+++ b/configure_cake_wallet_android.sh
@@ -2,6 +2,7 @@ cd scripts/android
 source ./app_env.sh cakewallet
 ./app_config.sh
 cd ../.. && flutter pub get
+flutter packages pub run tool/generate_localization.dart
 cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
 cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
 cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index 05486aa20..903fa14cc 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -480,7 +480,7 @@ abstract class ElectrumWalletBase
     unspentCoins = unspent.expand((e) => e).toList();
     unspentCoins.forEach((coin) async {
       final tx = await fetchTransactionInfo(hash: coin.hash, height: 0);
-      coin.isChange = tx!.direction == TransactionDirection.outgoing;
+      coin.isChange = tx?.direction == TransactionDirection.outgoing;
     });
 
     if (unspentCoinsInfo.isEmpty) {
diff --git a/lib/src/screens/wallet_connect/wc_connections_listing_view.dart b/lib/src/screens/wallet_connect/wc_connections_listing_view.dart
index 359d96b26..eda2a748f 100644
--- a/lib/src/screens/wallet_connect/wc_connections_listing_view.dart
+++ b/lib/src/screens/wallet_connect/wc_connections_listing_view.dart
@@ -31,6 +31,8 @@ class WalletConnectConnectionsView extends StatelessWidget {
 
     final actualLinkList = launchUri.query.split("uri=");
 
+    if (actualLinkList.length <= 1) return;
+
     final query = actualLinkList[1];
 
     final uri = Uri.decodeComponent(query);