[BZ 1120418] more refactoring for failed announce and removing more hard coded strings