JAL-4107 fix merge and avoid NPE