JAL-2110 defensive check in code