UI Server: Improve error handling