Fix: User cancel return error message
Merge branch 'dev' into dev_error_update
Merge pull request #115 from MSOpenTech/dev_error_update

Fix: User cancel return error message
merge from dev