Add two more exception types for slightly better exception filtering.

This should allow the filtering we need for now.