For #1 refactor to use Suppress(), add suppressed.raise_if.