Improved error flows.
Removed auto select and added check on select.