Handle more SuperAgent errors

Some of them were sneaking through the previous checks.