Should this catch KeyError too?