Fix potential JASPIC NPE
Merge pull request #6539 from stuartwdouglas/jaspic-npe

Fix potential JASPIC NPE