1 files changed, 5 insertions, 0 deletions

diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c
index 3e4640309..9c7ee533c 100644
--- a/src/testbed/testbed_api_barriers.c
+++ b/src/testbed/testbed_api_barriers.c
@@ -377,6 +377,11 @@ receive_handler (void *cls, const struct GNUNET_MessageHeader *message)
   const struct GNUNET_TESTBED_BarrierStatusMsg *msg;
   uint16_t msize;
   
+  if (NULL == message)
+  {
+    GNUNET_break_op (0);
+    goto fail;
+  }
   if (GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS != ntohs (message->type))
   {
     GNUNET_break_op (0);