Added some argc checks