JAL-1632 correct i18n and NPE