Print error when cleanup fails

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Make cleanup after failure more robust

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>