diff --git a/src/components/core/CoreManager.cpp b/src/components/core/CoreManager.cpp index 845664f33..a5d022d1c 100644 --- a/src/components/core/CoreManager.cpp +++ b/src/components/core/CoreManager.cpp @@ -121,8 +121,14 @@ shared_ptr CoreManager::getChatModel (const QString &peerAddress, con // Create a new chat model. QPair chatModelId{ peerAddress, localAddress }; if (!mChatModels.contains(chatModelId)) { - Q_ASSERT(mCore->createAddress(Utils::appStringToCoreString(peerAddress))); - Q_ASSERT(mCore->createAddress(Utils::appStringToCoreString(localAddress))); + if ( + !mCore->createAddress(Utils::appStringToCoreString(peerAddress)) || + !mCore->createAddress(Utils::appStringToCoreString(localAddress)) + ) { + qWarning() << QStringLiteral("Unable to get chat model from invalid chat model id: (%1, %2).") + .arg(peerAddress).arg(localAddress); + return nullptr; + } auto deleter = [this, chatModelId](ChatModel *chatModel) { bool removed = mChatModels.remove(chatModelId);