Added argument number checking
Added check for validity of first argument