More user input checking