Added Error Checking to allow Errors to be exposed to Orchestrator.