standardize p handlers, fix missing vault error