SPF: Catch any regexp errors, fixes one part of #666
Merge pull request #669 from smfreegard/master

SPF: Catch any regexp errors, fixes one part of #666