fixing
Merge pull request #6928 from guardian/fix-sentry-2226

Fix Sentry #2226