1 files changed, 5 insertions, 0 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_egos.c b/src/conversation/gnunet-conversation-gtk_egos.c
index 5136a938..9c6cc432 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -104,6 +104,11 @@ identity_cb (void *cls,
   GtkTreePath *path;
   GtkComboBox *cb;
 
+  if (NULL == ctx)
+  {
+    /* end of initial iteration, ignore */
+    return;
+  }
   rr = *ctx;
   if (NULL == rr)
   {