Improve error reporting in ServiceRegistry