re-added NPE test
re-added NPE test