NPE settings fix