Merge pull request #370 from erickt/fix-error

Actually include roles in error messages