NEW FUNCTIONALITY: Connector Exceptions Addded