BUG-12174 Make sure we have the info to make a Connector. Work around a bug.