more explicit error message
Merge branch 'feature/roles' into eHealth_staging
more explicit error message