Tidy up and eliminate remaining references to old error handler.
Attach a file by drag & drop or click to upload
