Index: src/lib/ecore_ipc/ecore_ipc.c
===================================================================
--- src/lib/ecore_ipc/ecore_ipc.c	(revision 67665)
+++ src/lib/ecore_ipc/ecore_ipc.c	(working copy)
@@ -316,7 +316,10 @@ ecore_ipc_shutdown(void)
    if (--_ecore_ipc_init_count != 0)
      return _ecore_ipc_init_count;
 
-   while (servers) ecore_ipc_server_del(eina_list_data_get(servers));
+   Eina_List *l, *l2;
+   Ecore_Ipc_Server *svr;
+   EINA_LIST_FOREACH_SAFE(servers, l, l2, svr)
+     ecore_ipc_server_del(svr);
 
    for (i = 0; i < 6; i++)
      ecore_event_handler_del(handler[i]);