null check incorporated