Merge "do not error out when there is no config"