1 files changed, 5 insertions, 5 deletions

diff --git a/src/gnunet_chat_handle_intern.c b/src/gnunet_chat_handle_intern.c
index e2ea342..14dcbd0 100644
--- a/src/gnunet_chat_handle_intern.c
+++ b/src/gnunet_chat_handle_intern.c
@@ -383,13 +383,13 @@ on_handle_message (void *cls,
 {
   struct GNUNET_CHAT_Handle *handle = cls;
 
-  struct GNUNET_CHAT_Context *context = request_handle_context_by_room(
-      handle, room
-  );
-
-  if (!context)
+  if (GNUNET_OK != request_handle_context_by_room(handle, room))
     return;
 
+  struct GNUNET_CHAT_Context *context = GNUNET_CONTAINER_multihashmap_get(
+      handle->contexts, GNUNET_MESSENGER_room_get_key(room)
+  );
+
   const struct GNUNET_TIME_Absolute timestamp = GNUNET_TIME_absolute_ntoh(
       msg->header.timestamp
   );