diff --git a/common/src/main/resources/i18n/displayStrings.properties b/common/src/main/resources/i18n/displayStrings.properties
index 98ddcbf95c..412059855d 100644
--- a/common/src/main/resources/i18n/displayStrings.properties
+++ b/common/src/main/resources/i18n/displayStrings.properties
@@ -828,8 +828,7 @@ settings.net.reSyncSPVSuccess=The SPV chain file has been deleted. You need to r
 After the restart it can take a while for resyncing with the network and you will only see all transactions once the resync is completed.\n\nPlease make another restart after the resync has completed because there are sometimes inconsistencies leading to incorrect balance display.
 settings.net.reSyncSPVAfterRestart=The SPV chain file has been deleted. Please have patience, it can take a while when resyncing with the network.
 settings.net.reSyncSPVAfterRestartCompleted=The resync is now completed. Please restart the application.
-
-settings.net.reSyncSPVFailed=Could not delete SPV chain file.
+settings.net.reSyncSPVFailed=Could not delete SPV chain file.\nError: {0}
 setting.about.aboutBisq=About Bisq
 setting.about.about=Bisq is an open source project and a decentralized network of users who want to exchange Bitcoin with national currencies or alternative crypto currencies in a privacy protecting way. Learn more about Bisq on our project web page.
 setting.about.web=Bisq web page
@@ -1286,6 +1285,7 @@ popup.error.createTx=Error at creating transaction: {0}
 popup.error.takeOfferRequestFailed=An error occurred when someone tried to take one of your offers:\n{0}
 
 error.spvFileCorrupted=An error occurred when reading the SPV chain file.\nIt might be that the SPV chain file is corrupted.\n\nError message: {0}\n\nDo you want to delete it and start a resync?
+error.deleteAddressEntryListFailed=Could not delete AddressEntryList file.\nError: {0}
 
 popup.warning.walletNotInitialized=The wallet is not initialized yet
 popup.warning.wrongVersion=You probably have the wrong Bisq version for this computer.\n\
diff --git a/core/src/main/java/io/bisq/core/btc/AddressEntryList.java b/core/src/main/java/io/bisq/core/btc/AddressEntryList.java
index 86c588f133..3850853f50 100644
--- a/core/src/main/java/io/bisq/core/btc/AddressEntryList.java
+++ b/core/src/main/java/io/bisq/core/btc/AddressEntryList.java
@@ -89,7 +89,7 @@ public final class AddressEntryList implements PersistableEnvelope, PersistedDat
         this.wallet = wallet;
 
         if (list != null) {
-            list.stream().forEach(addressEntry -> {
+            list.forEach(addressEntry -> {
                 DeterministicKey keyFromPubHash = (DeterministicKey) wallet.findKeyFromPubHash(addressEntry.getPubKeyHash());
                 if (keyFromPubHash != null) {
                     addressEntry.setDeterministicKey(keyFromPubHash);
diff --git a/gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java b/gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java
index 077454e0e3..84415f7309 100644
--- a/gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java
+++ b/gui/src/main/java/io/bisq/gui/main/overlays/windows/WalletPasswordWindow.java
@@ -69,7 +69,8 @@ import static javafx.beans.binding.Bindings.createBooleanBinding;
 @Slf4j
 public class WalletPasswordWindow extends Overlay<WalletPasswordWindow> {
     private final WalletsManager walletsManager;
-    private final File storageDir;
+    private File storageDir;
+
     private Button unlockButton;
     private AesKeyHandler aesKeyHandler;
     private PasswordTextField passwordTextField;