Added protection against NPEs