Merge "Catch all stash errors in cleanup script"