Add some checks on user inputs