1 files changed, 3 insertions, 0 deletions

diff --git a/src/set/set_api.c b/src/set/set_api.c
index af4907dea..4f0cebb57 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -811,9 +811,12 @@ check_request (void *cls,
 {
   const struct GNUNET_MessageHeader *context_msg;
 
+  if (ntohs (msg->header.size) == sizeof (*msg))
+    return GNUNET_OK; /* no context message is OK */
   context_msg = GNUNET_MQ_extract_nested_mh (msg);
   if (NULL == context_msg)
   {
+    /* malformed context message is NOT ok */
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }