Improve service and error handling a bit