Just added another Null Pointer check.