KRACOEUS-7725: fixing NPE
Merge pull request #765 from leoherbie/KRACOEUS-7725

KRACOEUS-7725: fixing NPE