Fix bug 1068451 - use guarded argument getter, r=waldo

--HG--
extra : amend_source : cf0dc2233bd0110c9247b6e3c836b8fcb0518a20