Improve validation by membership state.