JAL-4134 catch NPE - though in principle this should never happen…