diff --git a/src/conversationmanager.cpp b/src/conversationmanager.cpp
index 5b3ba62d414bcb44b1f54a438fa597d82286458e..2f422ff387b11e6637f6dd9eaea8b07fb7d11f3a 100644
--- a/src/conversationmanager.cpp
+++ b/src/conversationmanager.cpp
@@ -68,6 +68,10 @@ void ConversationManager::handleMessageReceived(Swift::Message::ref message) {
 // 		name.replace(name.find_last_of("%"), 1, "@"); // OK when commented
 // 	}
 	std::string name = Buddy::JIDToLegacyName(message->getTo());
+	if (name.empty()) {
+		LOG4CXX_WARN(logger, m_user->getJID().toString() << ": Tried to create empty conversation");
+		return;
+	}
 
 	// create conversation if it does not exist.
 	if (!m_convs[name]) {