- avoid NPE

diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index fe5db5e6f7ae49c383e647f0fcc199ebc03ca848..4782a69df00dd271d4ae114ccc2ad5140510727c 100644 (file)
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -1542,6 +1542,10 @@ cleanup_channel (void *cls,
   RPS_sampler_reinitialise_by_value (peer);
 
   peer_ctx = GNUNET_CONTAINER_multipeermap_get (peer_map, peer);
+
+  if (NULL == peer_ctx) /* It could have been removed by shutdown_task */
+    return;
+
   /* Somwewhat {ab,re}use the iterator function */
   /* Cast to void is ok, because it's used as void in peer_remove_cb */
   (void) peer_remove_cb ((void *) channel, peer, peer_ctx);