Revert 8ac6696 but handle the error.