1 files changed, 4 insertions, 1 deletions

diff --git a/src/gnunet_chat_lib.c b/src/gnunet_chat_lib.c
index f985854..fb86885 100644
--- a/src/gnunet_chat_lib.c
+++ b/src/gnunet_chat_lib.c
@@ -665,7 +665,7 @@ GNUNET_CHAT_context_iterate_files (struct GNUNET_CHAT_Context *context,
 enum GNUNET_CHAT_MessageKind
 GNUNET_CHAT_message_get_kind (const struct GNUNET_CHAT_Message *message)
 {
-  if ((!message) || (!(message->msg)))
+  if (!message)
     return GNUNET_CHAT_KIND_UNKNOWN;
 
   switch (message->flag)
@@ -678,6 +678,9 @@ GNUNET_CHAT_message_get_kind (const struct GNUNET_CHAT_Message *message)
       break;
   }
 
+  if (!(message->msg))
+    return GNUNET_CHAT_KIND_UNKNOWN;
+
   switch (message->msg->header.kind)
   {
     case GNUNET_MESSENGER_KIND_JOIN: