Add error handling to improve user experience