Bug Fix on null Pointer.