Error handling.
Minor change
Minot test change
Another test
Bug fixes and UX improvements.