Adding connection self termination for all BaseMessageConnections