Fix NPE with announcing