Improved fault and error handling.