update for Null Pointer