Don't require company fields in morph handler