#935 - Protection against NPE