KRACOEUS-7994 fixed NPEs
Merge pull request #797 from jhulslander/KRACOEUS-7994-IRBAttach

KRACOEUS-7994 fixed NPEs