[UST] Refactoring the error handling system (commit to work from home)