added null check along with empty string check as last commit changes were breaking older jobs
Merge pull request #2 from pjangam/RegexSupport

added null check along with empty string check