Why did we need to add a null check here?  I don't see any place where we could be calling this with null, and the docs still say it's required.