Respond to PR and remove exception handling for AttributeError