@cpcloud I am thinking that this should also be changed to raise ValueError rather than KeyError