Begin to improve failure handling.