Update to reflect status of error handling.