NPE removed