Better handling of problems with settings not being set on persist.