Fixed plugin throwing NPE on the listeners