JAL-2738 code tidy up, null checks &c