6e6be7c953
Currently, we've got two places where NO_COMPANION_OBJECT is reported and they perform it kind of differently