Rivera persist broken graphs

@phtaylor