Add domain and cluster for error handling