Be safer about chomping the addon name

Likely only applies to HPG