standardize p handlers, fix missing vault error
Merge pull request #73 from SonarBeserk/master

Standardise permission handlers.
- also fix error when Vault is missing