Merge "Catch IOException for close"