Small fix to avoid repeated incorrect invalid messages after the first failed check
Merge branch 'hotfix-2.2.39'