ensuure we don't store 'null' in the name->guid cache object
(an alternative to #572)