[JES] Couple of quick null checks to get rid of console errors

Merge request reports

Loading