removing early exit and adding more verbosity to oneservice