Check if attributionControl exists, before remove/add.
Merge pull request #69 from erf/master

check if AttributionControl exists before adding/removing it