Include null check for Equals