Add error handling for invalid service