cleaning up error handling changing service name