Improved error handling support.