#935 - Protect against NPE