refs #524 - avoid NPE