diff --git a/src/libclient/accountmodel.cpp b/src/libclient/accountmodel.cpp
index 5407b9798bf59c7b9a3e4a15f1055d71488f81cb..30dc5850ee432fbec493729287a84eed4f5e5191 100644
--- a/src/libclient/accountmodel.cpp
+++ b/src/libclient/accountmodel.cpp
@@ -564,8 +564,8 @@ AccountModelPimpl::slotAccountDetailsChanged(const QString& accountId,
 {
     auto account = accounts.find(accountId);
     if (account == accounts.end()) {
-        throw std::out_of_range("AccountModelPimpl::slotAccountDetailsChanged, can't find "
-                                + accountId.toStdString());
+        qWarning() << Q_FUNC_INFO << ": can't find " << accountId;
+        return;
     }
     auto& accountInfo = account->second.first;
     accountInfo.fromDetails(details);
@@ -585,8 +585,7 @@ AccountModelPimpl::slotVolatileAccountDetailsChanged(const QString& accountId,
 {
     auto account = accounts.find(accountId);
     if (account == accounts.end()) {
-        qWarning() << "AccountModelPimpl::slotVolatileAccountDetailsChanged, can't find "
-                   << accountId;
+        qWarning() << Q_FUNC_INFO << ": can't find " << accountId;
         return;
     }
     auto& accountInfo = account->second.first;
diff --git a/tests/qml/src/tst_MessageOptions.qml b/tests/qml/src/tst_MessageOptions.qml
index c18f37b5a80672327548f1a405b9b905a7c107c7..e32654f066b97e8c524c81a8bac3f8f2888c34e6 100644
--- a/tests/qml/src/tst_MessageOptions.qml
+++ b/tests/qml/src/tst_MessageOptions.qml
@@ -82,7 +82,8 @@ Item {
                 "username": "currentAccountUsername"
             });
             // Block on account creation
-            accountAdded.wait(1000);
+            accountAdded.wait(2000);
+            compare(accountAdded.count, 1)
 
             // Add some emoji reactions (one from current account uri, one from another uri)
             emojiReactions.reactions = {
@@ -101,5 +102,9 @@ Item {
             verify(JSON.stringify(optionsPopup.emojiReplied) === JSON.stringify(["🌭"]),
                 "Message options popup should have emoji replied");
         }
+
+        function cleanupTestCase() {
+            AccountAdapter.deleteCurrentAccount()
+        }
     }
 }