Better integration with core error handling.