NPE test added