Added arg count check