Pure whitespace changes
Add error handling to getEffectiveUser
Add missing error checks
Add missing return statement