LPS-49206 resolve null field name