Revert "NPE check"

This reverts commit a13cf6113716de3fea91ddacef8b74b30f87587e.