Don't fail on subscription duplicate

@stefansundin I'm creating the PR for you so we can see if Travis is happy, then I'll merge into master