Relocated checking for size of service list to the appropriate method