Really fix that KeyError.