Fix some more cases where object.company is used, but may be
set to None.

See #15.