Change exception policy to try to capture more edge cases