Improve handling of incorrect membership data