Cleanup of domain listeners and better isDone error handling