Return error message when error there is when deleting a file
Merge remote-tracking branch 'upstream/pr/11619' into pr/11619

* upstream/pr/11619:
  Return error message when error there is when deleting a file