diff --git a/lib/monero/monero_wallet.dart b/lib/monero/monero_wallet.dart
index 753dff53b..c9ea9e03e 100644
--- a/lib/monero/monero_wallet.dart
+++ b/lib/monero/monero_wallet.dart
@@ -454,7 +454,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     accountList.accounts.forEach((account) {
       _subaddressList.update(accountIndex: account.id);
       _subaddressList.subaddresses.forEach((subaddress) {
-        _addresses.addAll({subaddress.address:subaddress.label});
+        _addresses[subaddress.address] = subaddress.label;
       });
     });
 
diff --git a/lib/view_model/contact_list/contact_list_view_model.dart b/lib/view_model/contact_list/contact_list_view_model.dart
index fd6196c89..b5143cffa 100644
--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@@ -20,7 +20,7 @@ abstract class ContactListViewModelBase with Store {
     walletInfoSource.values.forEach((info) {
       if (info.address?.isNotEmpty ?? false) {
         if (info.addresses != null) {
-          info.addresses.forEach((address, label) {
+          info.addresses?.forEach((address, label) {
             walletContacts.add(WalletContact(
                 address,
                 info.name + ' ($label)',