Adding some type checking

- handle cases where a service has no units.