Merge "Added checking input variables in pnf-pnp"