Merge "Add DeleteErrorException"