Improved logging. Do not reuse old subscription if affiliation is none.