Wrap helper in conditional to prevent client tests erroring
Lint errors