Added mechanism to run queries on the control conn

Fixed issue where the connection wouldn't have been
closed as a result of a timeout or error.