Include null check