Adding condition to check that both arguments are passed