KRACOEUS-7996 fixing NPEs on error handling
Merge pull request #800 from jhulslander/KRACOEUS-7996-IRBOnlineReview

KRACOEUS-7996 fixing NPEs on error handling