Merge "Upgraded User::saveSettings logged errors to exceptions"