adcef46599
Change to throw more correct ValueError when name is not found as per IRC discussion
Change to throw more correct ValueError when name is not found as per IRC discussion