Improve working about why to remove the working directory if possible.

PR: www/94888
Submitted by: Joel Gudknecht <photohaus at gmail dot com>
Discussed with: ceri, Daniel Gerzo <danger at rulez dot sk>