Handle races and missing daya better.