If it fixes an issue for a customer I'm all for merging it, but it would be good to have some strategy to understand what's really happening here, perhaps logging what the token string looks like when `preg_match` fails?