diff --git a/src/bin/evas/evas_cserve2_main_loop_linux.c b/src/bin/evas/evas_cserve2_main_loop_linux.c
index 5222ab90d9..35c9d56578 100644
--- a/src/bin/evas/evas_cserve2_main_loop_linux.c
+++ b/src/bin/evas/evas_cserve2_main_loop_linux.c
@@ -258,7 +258,10 @@ _socketfd_setup(void)
      {
         if (connect(s, (struct sockaddr *)&socket_local, len) != -1)
           {
-             ERR("cserve2 service already there: \"%s\"", strerror(errno));
+             if (errno == EADDRINUSE)
+               ERR("cserve2 service already there: \"%s\"", strerror(errno));
+             else
+               ERR("cserve2 could connect the socket: %d \"%s\"", errno, strerror(errno));
              close(s);
              return -1;
           }
diff --git a/src/bin/evas/evas_cserve2_shm.c b/src/bin/evas/evas_cserve2_shm.c
index 5e60138b42..99b7f25066 100644
--- a/src/bin/evas/evas_cserve2_shm.c
+++ b/src/bin/evas/evas_cserve2_shm.c
@@ -68,7 +68,7 @@ cserve2_shm_request(size_t size)
      }
 
    do {
-        snprintf(shmname, sizeof(shmname), "/evas-shm-img-%d", id++);
+        snprintf(shmname, sizeof(shmname), "/evas-shm-img-%x-%d", (int)getuid(), id++);
         fd = shm_open(shmname, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
         if (fd == -1 && errno != EEXIST)
           {