- fix NullPointerException