Wrap in try-finally. Cherry-pick c73dfcd1 from master.
Attach a file by drag & drop or click to upload
