Added error handling in the overall domain