Ensure service_name is always returned

- Test not just for isset(), but !empty(), when determining if we need
  to generate a service_name from the controller_service_name