JAL-629 Catch a NPE, fix a test