Updated null check.