Updates to error handling

UI improvements