Now handles bad input in 'add' properly