1 files changed, 3 insertions, 1 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 0afbffbc..51c2062f 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -648,7 +648,9 @@ void Connection::Private::completeSetup(const QString& mxId)
         });
     } else {
         // account already existing
-        olmAccount->unpickle(database->accountPickle(), picklingMode);
+        if (!olmAccount->unpickle(database->accountPickle(), picklingMode))
+            qWarning(E2EE)
+                << "Could not unpickle Olm account, E2EE won't be available";
     }
 #endif // Quotient_E2EE_ENABLED
     emit q->stateChanged();