Clarity of fix for 7085981 could be improved by using a multicatch instead of the try catch, finally
that was used.