[FIXES JENKINS-16823] Report errors and retry delete

See https://issues.jenkins-ci.org/browse/JENKINS-16823