More error handling consolidation