fixed bug where client crashes onLoad
Merge remote-tracking branch 'origin/master' into PermissionsProps