#691 - Add NPE protection