Relax catch clause for errors during activation
Merge pull request #4844 from pmorie/activate

Merged by openshift-bot