diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog
index 4dae6a9a9e..c0007cd3a5 100644
--- a/legacy/ecore/ChangeLog
+++ b/legacy/ecore/ChangeLog
@@ -936,3 +936,7 @@
 
        * Fix ecore_x_randr to actually return crtcs possible outputs properly.
        * Fix ecore_x_randr to actually return crtcs outputs properly.
+
+2012-09-13  Mike Blumenkrantz
+
+       * Return -1 for ecore_con_server_fd_get() in the case that the server has already been deleted
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index 65e5779fff..0b185bd595 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -953,6 +953,7 @@ ecore_con_server_fd_get(Ecore_Con_Server *svr)
         return -1;
      }
    if (svr->created) return -1;
+   if (svr->delete_me) return -1;
    return ecore_main_fd_handler_fd_get(svr->fd_handler);
 }