Improved exception handling in cleanup script.
indentation
Merge commit 'f7ff4993c54d671500fd708b75fe65f799a157b6'