Make custom LJ properties conversion safer / more generic

[#41834627]