The only change to that handler in this PR is the indentation.  It is out of the scope of this PR to worry about the philosophy of exception handling on code that has been in use for literally years.