fix error of removing user data when error occour
Merge remote-tracking branch 'origin/master'