Add handling of a failing source.

Also fix intermittent race with cfg.CONF