Add better checking to mask 'missing hash' value when storing calculated hash code