minor change; validity check and remove extra parameter #2558

follow up to review of earlier PR #3001