I would raise KeyError here (and catch only KeyError).