handle errors from user validation
Merge branch 'develop'