Improving domain error handling.