Fix a merge error in r149007 (was missing a null check added in r148777).