Merge "Fix stream not being closed on all exception paths."