Improved error handling (adding proper reject reasons in a few more places)