* Fix NullPointerException issues