Update graph generation to account for exceptions.
Clean up logging, slightly.