diff --git a/src/conversation.cpp b/src/conversation.cpp
index 2ae9fcf8..e2cd5112 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -32,6 +32,7 @@ Conversation::Conversation(ConversationManager *conversationManager, const std::
 	m_legacyName = legacyName;
 	m_conversationManager->addConversation(this);
 	m_muc = isMUC;
+	std::cout << "new conversation " << legacyName << "\n";
 }
 
 Conversation::~Conversation() {
diff --git a/src/conversationmanager.cpp b/src/conversationmanager.cpp
index 4110132e..c32640a2 100644
--- a/src/conversationmanager.cpp
+++ b/src/conversationmanager.cpp
@@ -37,6 +37,7 @@ ConversationManager::ConversationManager(User *user, Component *component){
 
 ConversationManager::~ConversationManager() {
 	while(!m_convs.empty()) {
+		m_convs.erase(m_convs.begin());
 		delete (*m_convs.begin()).second;
 	}
 }