Fixed async error handling