Fix behavior when no service containers