diff --git a/include/transport/conversationmanager.h b/include/transport/conversationmanager.h
index fd56f8777b5d23a13373eaf1475e872f1df30f36..487e000aa1d953f5195bdcc6090ee25ac99691d9 100644
--- a/include/transport/conversationmanager.h
+++ b/include/transport/conversationmanager.h
@@ -58,6 +58,8 @@ class ConversationManager {
 		/// \param name legacy network name.
 		/// \return Conversation or NULL.
 		Conversation *getConversation(const std::string &name) {
+			if (m_convs.find(name) == m_convs.end())
+				return NULL;
 			return m_convs[name];
 		}