Amended both examples above to allow for shapes which contain no text.

(Thanks to Whpalmer4 for spotting that issue).