Added some error handling, UI messages