Per bug #6181 from Itagaki Takahiro. Also do some marginal code cleanup and improve error handling.
Attach a file by drag & drop or click to upload
