Fix Bug : NullPointerException