Making the domain_op complete? method more robust