Fixed an issue in the waiter factory that caused adding custom waiters to fail for services without any existing waiters.