Check if regex match is carried out successfully
Yoda fix
Merge pull request #522 from x-team/issue-avatar-hotfix

Check if regex match is carried out successfully