Undefined index: fid in eval() (line 1 of contemplate.module(833))

I'm getting the above PHP notice when Contemplate tries to generate an enclosure for a field with no value. Patches attached for 6.x-1.x-dev and 6.x-1.2.