#691 - Protected against NPE