add back client services
more properly handle errors