You're right, it should only appear if it's provided. I'll make a separate change for that.  I'll be pulling your changes in today.

Cheers chap.