Fixed errors in HandlePnf flow