Improve cancel dialog handling by passing the error code additionally  and fix possible error in user facing error messages