Remove NullPointerException