Plugged a hole in the add/remove logic that would allow modifying client/service connections.