Changed listener precondition checking