NPE correction