Another NullPointerException fixed