diff --git a/src/bin/evas/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c
index 277f36c5aa..1be8a49d1c 100644
--- a/src/bin/evas/evas_cserve2_slaves.c
+++ b/src/bin/evas/evas_cserve2_slaves.c
@@ -153,10 +153,15 @@ _slave_write(Slave *s, const char *data, size_t size)
           {
              if (errno == EAGAIN)
                break;
-             if (errno == EPIPE)
+             else if (errno == EPIPE)
                {
                   WRN("Slave unexpectedly gone.");
-                  /* handle dead? */
+                  /* FIXME: handle dead? */
+                  break;
+               }
+             else
+               {
+                  ERR("Unhandled error occurred when writing to slave: %d %m", errno);
                   break;
                }
           }