Failure handling improvements.