LPS-40492

Hi @migue,

this is a simple NPE fix. @rotty3000 (component leader) is on vacation, let me know if I should send it to somebody else.

Thank you!