Checking if the arguments contain should be done earlier