Update to error handling and UI.