diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 8cedfa2b65bad437d80284e4b35274694fe4551c..3c8d6c927454bc067716e69d212b1c75523074f7 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -1470,7 +1470,13 @@ RingAccount::loadAccount(const std::string& archive_password, const std::string&
                     migrateAccount(archive_password);
                 } else {
                     RING_WARN("[Account %s] archive present but no valid receipt: creating new device", getAccountID().c_str());
-                    initRingDevice(readArchive(archive_password));
+                    try {
+                        initRingDevice(readArchive(archive_password));
+                    } catch (...) {
+                        Migration::setState(accountID_, Migration::State::INVALID);
+                        return;
+                    }
+                    Migration::setState(accountID_, Migration::State::SUCCESS);
                 }
                 Manager::instance().saveConfig();
             }