Moving this to final... I'd still like to write a decent reproducer of this and handle this situation by returning null, but also don't want to hold up CR2 any more just for this one..