Same comment as on previous classes -- incorporate the null check into this condition to retain previous behavior.