Merge "Fix a possible file descriptor leakage"