Fix a couple null refs that Alicia was seeing.