Handle case when @activity returns nil and remove extra code
Merge branch 'master' into HEAD
Merge branch 'master' of https://github.com/empirical-org/Compass