Do not rely on not_ready(), always check service readiness

Do not rely on not_ready(), always check service readiness #978