add one redundant (for new code) null check back.