1 files changed, 2 insertions, 0 deletions

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 2cf43f111..fe7126d03 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -681,6 +681,8 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
   int old_match;
   int new_match;
 
+  if (GNUNET_CORE_OPTION_NOTHING == client->options)
+    return; /* client did not yet send init */
   old_match = GSC_TYPEMAP_test_match (tmap_old,
                                       client->types,
                                       client->tcnt);