Fail gracefully as non-privileged user
Merge pull request #3328 from intchanter/develop

Fail gracefully as non-privileged user