Bugfix: Unique set references
service call error handling