small improvement en NPE fix