Fixed a few places where nulls sneaked through.