Fix bug where 'safe' objects were not being correctly invalidated after reading in a new catalog