Merge "Fix for NullPointerException in Pnf"