Small fix when service unavailable