address Andrey's review. Mostly thread reference to descriptor to report meaningful error