More fixes for async error handling.