Fix potential JASPIC NPE