Merge "Pass more accurate error message to DeleteErrorException"