Index: uspace/srv/bd/vbd/vbd.c
===================================================================
--- uspace/srv/bd/vbd/vbd.c	(revision 55f8c6e7f883eebaa94a912da5ef642615faf634)
+++ uspace/srv/bd/vbd/vbd.c	(revision 3feeab2bb1fdb0b4062cc7b3e6c493d1552814dc)
@@ -64,21 +64,21 @@
 		return rc;
 
+	async_set_client_connection(vbds_client_conn);
+
+	rc = loc_server_register(NAME);
+	if (rc != EOK) {
+		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
+		return EEXIST;
+	}
+
+	rc = loc_service_register(SERVICE_NAME_VBD, &ctl_sid);
+	if (rc != EOK) {
+		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+		return EEXIST;
+	}
+
 	rc = vbds_disk_discovery_start();
 	if (rc != EOK)
 		return rc;
-
-	async_set_client_connection(vbds_client_conn);
-
-	rc = loc_server_register(NAME);
-	if (rc != EOK) {
-		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
-		return EEXIST;
-	}
-
-	rc = loc_service_register(SERVICE_NAME_VBD, &ctl_sid);
-	if (rc != EOK) {
-		log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
-		return EEXIST;
-	}
 
 	return EOK;