Adding failure handling for connectors
11 files changed