Fixed plugin NPE