Fix NullPointerException

can this be static now