Port fix for bare except from amo-validator