1 files changed, 2 insertions, 0 deletions

diff --git a/src/cadet/gnunet-service-cadet_local.c b/src/cadet/gnunet-service-cadet_local.c
index 20cf1592b..8660b1899 100644
--- a/src/cadet/gnunet-service-cadet_local.c
+++ b/src/cadet/gnunet-service-cadet_local.c
@@ -1292,6 +1292,8 @@ GML_get_next_chid (struct CadetClient *c)
 struct CadetClient *
 GML_client_get (struct GNUNET_SERVER_Client *client)
 {
+  if (NULL == client)
+    return NULL;
   return GNUNET_SERVER_client_get_user_context (client, struct CadetClient);
 }