DF NPE fix for PPS