Some exception handling consolidation.