s4:pwsettings - Simplify the error handling a bit