Improved UX and exception handling