More NPE safeguards