Should this also catch RuntimeException and wrap it in a ConnectorException?