Merge "destroy file handle in error case" into main