saner handling of evaluation w/o connected client