Error handling, service & UI improvements