Additional NPE protection