Adding more existence checks to one of the listeners