1 files changed, 2 insertions, 1 deletions

diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/rps/gnunet-service-rps_sampler.c
index f1b8f32cf..be67482fb 100644
--- a/src/rps/gnunet-service-rps_sampler.c
+++ b/src/rps/gnunet-service-rps_sampler.c
@@ -596,8 +596,9 @@ sampler_mod_get_rand_peer (void *cls,
 
   s_elem = gpc->sampler->sampler_elements[client_get_index];
   *gpc->id = s_elem->peer_id;
+  GNUNET_assert (NULL == s_elem);
 
-  if (NULL == s_elem)
+  if (EMPTY == s_elem->is_empty)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Sampler_mod element empty, rescheduling.\n");
     GNUNET_assert (NULL == gpc->get_peer_task);