diff --git a/src/wayland-server.c b/src/wayland-server.c
index 93cc38a6..72aa88df 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -1001,10 +1001,10 @@ wl_display_destroy(struct wl_display *display)
 
 	wl_list_for_each_safe(s, next, &display->socket_list, link) {
 		wl_event_source_remove(s->source);
-		close(s->fd);
 		unlink(s->addr.sun_path);
-		close(s->fd_lock);
+		close(s->fd);
 		unlink(s->lock_addr);
+		close(s->fd_lock);
 		free(s);
 	}
 	wl_event_loop_destroy(display->loop);
@@ -1196,18 +1196,18 @@ wl_display_add_socket(struct wl_display *display, const char *name)
 
 	size = offsetof (struct sockaddr_un, sun_path) + name_size;
 	if (bind(s->fd, (struct sockaddr *) &s->addr, size) < 0) {
-		close(s->fd_lock);
-		unlink(s->lock_addr);
 		close(s->fd);
+		unlink(s->lock_addr);
+		close(s->fd_lock);
 		free(s);
 		return -1;
 	}
 
 	if (listen(s->fd, 1) < 0) {
-		close(s->fd_lock);
-		unlink(s->lock_addr);
-		close(s->fd);
 		unlink(s->addr.sun_path);
+		close(s->fd);
+		unlink(s->lock_addr);
+		close(s->fd_lock);
 		free(s);
 		return -1;
 	}
@@ -1216,10 +1216,10 @@ wl_display_add_socket(struct wl_display *display, const char *name)
 					 WL_EVENT_READABLE,
 					 socket_data, display);
 	if (s->source == NULL) {
-		close(s->fd_lock);
-		unlink(s->lock_addr);
-		close(s->fd);
 		unlink(s->addr.sun_path);
+		close(s->fd);
+		unlink(s->lock_addr);
+		close(s->fd_lock);
 		free(s);
 		return -1;
 	}