Use more Removal of NullPointerException