i seem to remember a recent PR where closing was put into a finally block ... or we excplicity called close if an exception occurred ... does this need PR need to be rebased or do we need to do the same thing here? 