Extending error handling