[+BUGFIX] two small fixes to handle wrong user input