Catch exception for user bind
Merge branch 'develop' into share-build